From f4a22d97790ae78671dae41f7d057087fc158eeb Mon Sep 17 00:00:00 2001
From: QIU <Kero64@126.com>
Date: Wed, 5 Aug 2026 06:29:21 +0000
Subject: [PATCH] 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.
---
 feature/ft8/src/main/AndroidManifest.xml | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/feature/ft8/src/main/AndroidManifest.xml b/feature/ft8/src/main/AndroidManifest.xml
index 38990bd1..f342e9d9 100644
--- a/feature/ft8/src/main/AndroidManifest.xml
+++ b/feature/ft8/src/main/AndroidManifest.xml
@@ -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>
\ No newline at end of file