From 260b3bfb1b76205d082cd5c4b9bb4c3d86bb1f24 Mon Sep 17 00:00:00 2001
From: Patrick Honkonen <1883101+SaintPatrck@users.noreply.github.com>
Date: Wed, 31 Jul 2024 09:11:09 -0400
Subject: [PATCH] [PM-9803] Enable Credential Manager on production builds
 (#3651)

---
 app/src/main/AndroidManifest.xml             | 21 ++++++++++++++++++++
 app/src/{debug => main}/res/xml/provider.xml |  0
 app/src/standardDebug/AndroidManifest.xml    | 20 -------------------
 3 files changed, 21 insertions(+), 20 deletions(-)
 rename app/src/{debug => main}/res/xml/provider.xml (100%)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index b7c9918ba71..adaa320fa29 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -141,6 +141,27 @@
             </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>
+
         <!-- This is required to support in-app language picker in Android 12 (API 32) and below -->
         <service
             android:name="androidx.appcompat.app.AppLocalesMetadataHolderService"
diff --git a/app/src/debug/res/xml/provider.xml b/app/src/main/res/xml/provider.xml
similarity index 100%
rename from app/src/debug/res/xml/provider.xml
rename to app/src/main/res/xml/provider.xml
diff --git a/app/src/standardDebug/AndroidManifest.xml b/app/src/standardDebug/AndroidManifest.xml
index 2d1f1707da1..088f2067324 100644
--- a/app/src/standardDebug/AndroidManifest.xml
+++ b/app/src/standardDebug/AndroidManifest.xml
@@ -10,26 +10,6 @@
                 <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"