From 9135b2e157e479abcdba9e9cdf594aff7ecf66f1 Mon Sep 17 00:00:00 2001
From: Helen Qin <helenqin@google.com>
Date: Tue, 8 Nov 2022 19:58:45 +0000
Subject: [PATCH] Properly define the Credential Manager dialog component name.

Bug: 247855226
Bug: 253156958
Test: local deployment
Change-Id: I562a8bae0fa1c7132cf262909525add34dbda19a
---
 core/java/android/credentials/ui/IntentFactory.java | 8 +++++---
 core/res/res/values/config.xml                      | 4 ++++
 core/res/res/values/symbols.xml                     | 1 +
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/core/java/android/credentials/ui/IntentFactory.java b/core/java/android/credentials/ui/IntentFactory.java
index 475169670eb13..b608e65b96b41 100644
--- a/core/java/android/credentials/ui/IntentFactory.java
+++ b/core/java/android/credentials/ui/IntentFactory.java
@@ -18,6 +18,7 @@ package android.credentials.ui;
 
 import android.content.ComponentName;
 import android.content.Intent;
+import android.content.res.Resources;
 import android.os.Parcel;
 import android.os.ResultReceiver;
 
@@ -36,9 +37,10 @@ public class IntentFactory {
             ArrayList<DisabledProviderData> disabledProviderDataList,
             ResultReceiver resultReceiver) {
         Intent intent = new Intent();
-        // TODO: define these as proper config strings.
-        String activityName = "com.android.credentialmanager/.CredentialSelectorActivity";
-        intent.setComponent(ComponentName.unflattenFromString(activityName));
+        ComponentName componentName = ComponentName.unflattenFromString(
+                Resources.getSystem().getString(
+                        com.android.internal.R.string.config_credentialManagerDialogComponent));
+        intent.setComponent(componentName);
 
         intent.putParcelableArrayListExtra(
                 ProviderData.EXTRA_ENABLED_PROVIDER_DATA_LIST, enabledProviderDataList);
diff --git a/core/res/res/values/config.xml b/core/res/res/values/config.xml
index fcf38c5f78b13..4a60fb7e82925 100644
--- a/core/res/res/values/config.xml
+++ b/core/res/res/values/config.xml
@@ -2958,6 +2958,10 @@
     <string name="config_carrierAppInstallDialogComponent" translatable="false"
             >com.android.simappdialog/com.android.simappdialog.InstallCarrierAppActivity</string>
 
+    <!-- Name of the dialog that is used to get or save an app credential -->
+    <string name="config_credentialManagerDialogComponent" translatable="false"
+            >com.android.credentialmanager/com.android.credentialmanager.CredentialSelectorActivity</string>
+
     <!-- Apps that are authorized to access shared accounts, overridden by product overlays -->
     <string name="config_appsAuthorizedForSharedAccounts" translatable="false">;com.android.settings;</string>
 
diff --git a/core/res/res/values/symbols.xml b/core/res/res/values/symbols.xml
index 7b6284196bfd5..e9f80235d7468 100644
--- a/core/res/res/values/symbols.xml
+++ b/core/res/res/values/symbols.xml
@@ -2263,6 +2263,7 @@
   <java-symbol type="string" name="config_customVpnAlwaysOnDisconnectedDialogComponent" />
   <java-symbol type="string" name="config_platformVpnConfirmDialogComponent" />
   <java-symbol type="string" name="config_carrierAppInstallDialogComponent" />
+  <java-symbol type="string" name="config_credentialManagerDialogComponent" />
   <java-symbol type="string" name="config_defaultNetworkScorerPackageName" />
   <java-symbol type="string" name="config_persistentDataPackageName" />
   <java-symbol type="string" name="config_deviceConfiguratorPackageName" />