From 28abf3049e5f25d1ae4433dbc6a9aae37fa94529 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Wed, 8 Jul 2026 11:55:50 +0200
Subject: [PATCH 1/2] Cleanup AndroidManifest.xml files.

---
 app/src/main/AndroidManifest.xml                            | 3 ---
 features/call/impl/src/main/AndroidManifest.xml             | 1 +
 libraries/androidutils/src/main/AndroidManifest.xml         | 1 -
 .../api => mediaviewer/impl}/src/main/AndroidManifest.xml   | 6 +++---
 .../voicerecorder}/impl/src/main/AndroidManifest.xml        | 0
 5 files changed, 4 insertions(+), 7 deletions(-)
 rename libraries/{matrix/api => mediaviewer/impl}/src/main/AndroidManifest.xml (60%)
 rename {features/messages => libraries/voicerecorder}/impl/src/main/AndroidManifest.xml (100%)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index d63e18ec1a8..f6a3225cb81 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -8,9 +8,6 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools">
 
-    <!-- To be able to install APK from the application -->
-    <uses-permission android:name="android.permission.REQUEST_INSTALL_PACKAGES" />
-
     <application
         android:name=".ElementXApplication"
         android:allowBackup="false"
diff --git a/features/call/impl/src/main/AndroidManifest.xml b/features/call/impl/src/main/AndroidManifest.xml
index c35c6843ff4..f338b32b9ec 100644
--- a/features/call/impl/src/main/AndroidManifest.xml
+++ b/features/call/impl/src/main/AndroidManifest.xml
@@ -14,6 +14,7 @@
         android:name="android.hardware.microphone"
         android:required="false" />
 
+    <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
     <uses-permission android:name="android.permission.RECORD_AUDIO" />
     <uses-permission android:name="android.permission.CAMERA" />
diff --git a/libraries/androidutils/src/main/AndroidManifest.xml b/libraries/androidutils/src/main/AndroidManifest.xml
index 446c4606d73..941f4ef1a8a 100644
--- a/libraries/androidutils/src/main/AndroidManifest.xml
+++ b/libraries/androidutils/src/main/AndroidManifest.xml
@@ -7,5 +7,4 @@
   -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android">
     <uses-permission android:name="android.permission.VIBRATE" />
-    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
 </manifest>
diff --git a/libraries/matrix/api/src/main/AndroidManifest.xml b/libraries/mediaviewer/impl/src/main/AndroidManifest.xml
similarity index 60%
rename from libraries/matrix/api/src/main/AndroidManifest.xml
rename to libraries/mediaviewer/impl/src/main/AndroidManifest.xml
index 608f16cc365..3e5f3ecc7e4 100644
--- a/libraries/matrix/api/src/main/AndroidManifest.xml
+++ b/libraries/mediaviewer/impl/src/main/AndroidManifest.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?><!--
-  ~ Copyright (c) 2025 Element Creations Ltd.
-  ~ Copyright 2022 New Vector Ltd.
+  ~ Copyright (c) 2026 Element Creations Ltd.
   ~
   ~ SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
   ~ Please see LICENSE files in the repository root for full details.
   -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <uses-permission android:name="android.permission.INTERNET" />
+    <!-- To be able to install APK from the application -->
+    <uses-permission android:name="android.permission.REQUEST_INSTALL_PACKAGES" />
 
 </manifest>
diff --git a/features/messages/impl/src/main/AndroidManifest.xml b/libraries/voicerecorder/impl/src/main/AndroidManifest.xml
similarity index 100%
rename from features/messages/impl/src/main/AndroidManifest.xml
rename to libraries/voicerecorder/impl/src/main/AndroidManifest.xml

From 3dabece5f8fe04abc907fa1ef295db39befd2c27 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Wed, 8 Jul 2026 17:29:51 +0200
Subject: [PATCH 2/2] Restore AndroidManifest.xml to fix lint warning.

---
 features/messages/impl/src/main/AndroidManifest.xml | 10 ++++++++++
 1 file changed, 10 insertions(+)
 create mode 100644 features/messages/impl/src/main/AndroidManifest.xml

diff --git a/features/messages/impl/src/main/AndroidManifest.xml b/features/messages/impl/src/main/AndroidManifest.xml
new file mode 100644
index 00000000000..ed135aef7ac
--- /dev/null
+++ b/features/messages/impl/src/main/AndroidManifest.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~ Copyright (c) 2025 Element Creations Ltd.
+  ~ Copyright 2023 New Vector Ltd.
+  ~
+  ~ SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+  ~ Please see LICENSE files in the repository root for full details.
+  -->
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+    <uses-permission android:name="android.permission.RECORD_AUDIO" />
+</manifest>