From 4fb27fe1834c26cdc4a91c8a9e3c858099381056 Mon Sep 17 00:00:00 2001
From: Patrick Honkonen <1883101+SaintPatrck@users.noreply.github.com>
Date: Tue, 4 Jun 2024 17:26:35 -0400
Subject: [PATCH] Move credential provider service declaration to standardDebug
 manifest (#1422)

---
 app/src/debug/AndroidManifest.xml         | 22 ----------------------
 app/src/standardDebug/AndroidManifest.xml | 20 ++++++++++++++++++++
 2 files changed, 20 insertions(+), 22 deletions(-)

diff --git a/app/src/debug/AndroidManifest.xml b/app/src/debug/AndroidManifest.xml
index b60f59cddd..817ea4be7f 100644
--- a/app/src/debug/AndroidManifest.xml
+++ b/app/src/debug/AndroidManifest.xml
@@ -12,28 +12,6 @@
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
         </activity>
-
-        <!--
-        The CredentialProviderService name below refers to the legacy Xamarin app's service name.
-        This must always match in order for the app to properly query if it is providing credential
-        services.
-        -->
-        <!--suppress AndroidDomInspection -->
-        <service
-            android:name="com.x8bit.bitwarden.Autofill.CredentialProviderService"
-            android:enabled="true"
-            android:exported="true"
-            android:label="@string/bitwarden"
-            android:permission="android.permission.BIND_CREDENTIAL_PROVIDER_SERVICE"
-            tools:ignore="MissingClass">
-            <intent-filter>
-                <action android:name="android.service.credentials.CredentialProviderService" />
-            </intent-filter>
-            <meta-data
-                android:name="android.credentials.provider"
-                android:resource="@xml/provider" />
-        </service>
-
         <!-- Disable Crashlytics for debug builds -->
         <meta-data
             android:name="firebase_crashlytics_collection_enabled"
diff --git a/app/src/standardDebug/AndroidManifest.xml b/app/src/standardDebug/AndroidManifest.xml
index 088f206732..2d1f1707da 100644
--- a/app/src/standardDebug/AndroidManifest.xml
+++ b/app/src/standardDebug/AndroidManifest.xml
@@ -10,6 +10,26 @@
                 <action android:name="com.google.firebase.MESSAGING_EVENT" />
             </intent-filter>
         </service>
+        <!--
+        The CredentialProviderService name below refers to the legacy Xamarin app's service name.
+        This must always match in order for the app to properly query if it is providing credential
+        services.
+        -->
+        <!--suppress AndroidDomInspection -->
+        <service
+            android:name="com.x8bit.bitwarden.Autofill.CredentialProviderService"
+            android:enabled="true"
+            android:exported="true"
+            android:label="@string/bitwarden"
+            android:permission="android.permission.BIND_CREDENTIAL_PROVIDER_SERVICE"
+            tools:ignore="MissingClass">
+            <intent-filter>
+                <action android:name="android.service.credentials.CredentialProviderService" />
+            </intent-filter>
+            <meta-data
+                android:name="android.credentials.provider"
+                android:resource="@xml/provider" />
+        </service>
         <!-- Disable Crashlytics for debug builds -->
         <meta-data
             android:name="firebase_crashlytics_collection_enabled"