Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9135b2e1 authored by Helen Qin's avatar Helen Qin
Browse files

Properly define the Credential Manager dialog component name. 

Bug: 247855226
Bug: 253156958
Test: local deployment
Change-Id: I562a8bae0fa1c7132cf262909525add34dbda19a
parent 0fc931f2

core/java/android/credentials/ui/IntentFactory.java

+5 −3
Original line number Diff line number Diff line
@@ -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);

core/res/res/values/config.xml

+4 −0
Original line number Diff line number Diff line
@@ -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>

core/res/res/values/symbols.xml

+1 −0
Original line number Diff line number Diff line
@@ -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" />