fix(ft8): remove application tag from module manifest (merge conflict)
feature/ft8 module manifest carried an application element from the FT8CN standalone app (allowBackup/icon/label/usesCleartextTraffic), clashing with the main app manifest at merge (allowBackup false vs true, icon, label). Removed the tag - components (activities, service, permissions) remain and merge cleanly. Verified: processRelease- MainManifest + mergeReleaseResources BUILD SUCCESSFUL.
This commit is contained in:
1 parent
0e767f4250
commit
f4a22d9779
1 file changed
+1
-9
@@ -19,14 +19,6 @@
|
||||
<uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS" />
|
||||
<uses-permission android:name="android.permission.WAKE_LOCK" />
|
||||
|
||||
<application
|
||||
android:allowBackup="true"
|
||||
android:usesCleartextTraffic="true"
|
||||
android:icon="@drawable/ft8cn_icon"
|
||||
android:label="@string/app_name"
|
||||
android:roundIcon="@drawable/ft8cn_icon"
|
||||
android:supportsRtl="true"
|
||||
android:theme="@style/Theme.Ft8CN">
|
||||
<activity
|
||||
android:name=".grid_tracker.GridTrackerMainActivity"
|
||||
android:screenOrientation="sensorLandscape"
|
||||
@@ -84,6 +76,6 @@
|
||||
android:name="android.support.FILE_PROVIDER_PATHS"
|
||||
android:resource="@xml/filepaths" />
|
||||
</provider>
|
||||
</application>
|
||||
|
||||
|
||||
</manifest>
|
||||
Reference in new issue
Block a user