Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Properly define the Credential Manager dialog component name.

Browse Source 
Bug: 247855226
Bug: 253156958
Test: local deployment
Change-Id: I562a8bae0fa1c7132cf262909525add34dbda19a
This commit is contained in:
Helen Qin
2022-11-08 19:58:45 +00:00
parent 0fc931f2a1
commit 9135b2e157
3 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
core/java/android/credentials/ui/IntentFactory.java
View File

@@ -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);

4
core/res/res/values/config.xml
View File

@@ -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>

1
core/res/res/values/symbols.xml
View File

@@ -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" />