From 73385632274d0b980015cd3e2cbb4e65fb3c8e9a Mon Sep 17 00:00:00 2001 From: Thore Goebel Date: Thu, 7 May 2026 07:19:43 +0200 Subject: [PATCH] Restore Arm MTE opt-in for all build variants The opt-in was originally added in https://gitlab.com/fdroid/fdroidclient/-/merge_requests/1588 Since then, some AndroidManifest re-arrangement caused it to be moved to the legacy variant only. Move the MTE opt-in back to the root AndroidManifest. This fixes F-Droid Basic 2.0 not opting in to MTE. --- app/src/main/AndroidManifest.xml | 1 + legacy/src/main/AndroidManifest.xml | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index d6f6e0fc1..dd96e6967 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -39,6 +39,7 @@ android:icon="@mipmap/ic_launcher" android:label="@string/app_name" android:localeConfig="@xml/locales_config" + android:memtagMode="async" android:networkSecurityConfig="@xml/network_security_config" android:supportsRtl="true" android:theme="@style/Theme.FDroid" diff --git a/legacy/src/main/AndroidManifest.xml b/legacy/src/main/AndroidManifest.xml index d1b189c0d..8fb511990 100644 --- a/legacy/src/main/AndroidManifest.xml +++ b/legacy/src/main/AndroidManifest.xml @@ -78,7 +78,6 @@ android:icon="@drawable/ic_launcher" android:label="${applicationLabel}" android:localeConfig="@xml/locales_config" - android:memtagMode="async" android:networkSecurityConfig="@xml/network_security_config" android:requestLegacyExternalStorage="true" android:supportsRtl="true"