From 616e5b17f024ee4caba91cd7dcfd6f5b485eaebe Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Thu, 2 Sep 2021 09:43:39 +0200
Subject: [PATCH] Fix warning
 provider#androidx.work.impl.WorkManagerInitializer was tagged at
 AndroidManifest.xml:16 to remove other declarations but no other declaration
 present

---
 .../src/androidTest/AndroidManifest.xml        | 18 ++++++++++++++++++
 .../src/main/AndroidManifest.xml               |  9 ---------
 2 files changed, 18 insertions(+), 9 deletions(-)
 create mode 100644 matrix-sdk-android/src/androidTest/AndroidManifest.xml

diff --git a/matrix-sdk-android/src/androidTest/AndroidManifest.xml b/matrix-sdk-android/src/androidTest/AndroidManifest.xml
new file mode 100644
index 0000000000..274bd8c87b
--- /dev/null
+++ b/matrix-sdk-android/src/androidTest/AndroidManifest.xml
@@ -0,0 +1,18 @@
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    package="org.matrix.android.sdk">
+
+    <application>
+
+        <!--
+        This is mandatory to run integration tests
+        -->
+        <provider
+            android:name="androidx.work.impl.WorkManagerInitializer"
+            android:authorities="${applicationId}.workmanager-init"
+            android:exported="false"
+            tools:node="remove" />
+
+    </application>
+
+</manifest>
diff --git a/matrix-sdk-android/src/main/AndroidManifest.xml b/matrix-sdk-android/src/main/AndroidManifest.xml
index 220a168f60..de0731422c 100644
--- a/matrix-sdk-android/src/main/AndroidManifest.xml
+++ b/matrix-sdk-android/src/main/AndroidManifest.xml
@@ -10,15 +10,6 @@
 
     <application android:networkSecurityConfig="@xml/network_security_config">
 
-        <!--
-        This is mandatory to run integration tests
-        -->
-        <provider
-            android:name="androidx.work.impl.WorkManagerInitializer"
-            android:authorities="${applicationId}.workmanager-init"
-            android:exported="false"
-            tools:node="remove" />
-
         <!--
          The SDK offers a secured File provider to access downloaded files.
          Access to these file will be given via the FileService, with a temporary