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

Commit 7c70bad1 authored by Harsh Lal's avatar Harsh Lal Committed by Android (Google) Code Review
Browse files

Merge "Add Broadcast Receiver for listening to provider updates" into udc-dev

parents cdab1b87 35bdd081

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

+1 −1
Original line number Diff line number Diff line
@@ -78,7 +78,7 @@ public class IntentFactory { 
                        Resources.getSystem()

                                .getString(

                                        com.android.internal.R.string

                                                .config_credentialManagerDialogComponent));

                                                .config_credentialManagerReceiverComponent));

        intent.setComponent(componentName);

        intent.setAction(Constants.CREDMAN_ENABLED_PROVIDERS_UPDATED);

        return intent;

core/res/res/values/config.xml

+4 −0
Original line number Diff line number Diff line
@@ -3065,6 +3065,10 @@ 
    <string name="config_credentialManagerDialogComponent" translatable="false"

            >com.android.credentialmanager/com.android.credentialmanager.CredentialSelectorActivity</string>



    <!-- Name of the broadcast receiver that is used to receive provider change events -->

    <string name="config_credentialManagerReceiverComponent" translatable="false"

            >com.android.credentialmanager/com.android.credentialmanager.CredentialProviderReceiver</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
@@ -2210,6 +2210,7 @@ 
  <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_credentialManagerReceiverComponent" />

  <java-symbol type="string" name="config_defaultNetworkScorerPackageName" />

  <java-symbol type="string" name="config_persistentDataPackageName" />

  <java-symbol type="string" name="config_deviceConfiguratorPackageName" />

packages/CredentialManager/AndroidManifest.xml

+9 −0
Original line number Diff line number Diff line
@@ -41,6 +41,15 @@ 
        android:excludeFromRecents="true"

        android:theme="@style/Theme.CredentialSelector">

    </activity>



    <receiver

        android:name=".CredentialProviderReceiver"

        android:exported="true"

        android:permission="android.permission.LAUNCH_CREDENTIAL_SELECTOR">

        <intent-filter>

            <action android:name="android.credentials.ui.action.CREDMAN_ENABLED_PROVIDERS_UPDATED"/>

        </intent-filter>

    </receiver>

  </application>



</manifest>

packages/CredentialManager/src/com/android/credentialmanager/CredentialManagerRepo.kt

+1 −1
Original line number Diff line number Diff line
@@ -73,7 +73,7 @@ class CredentialManagerRepo( 
        requestInfo = intent.extras?.getParcelable(

            RequestInfo.EXTRA_REQUEST_INFO,

            RequestInfo::class.java

        ) ?: testCreatePasskeyRequestInfo()

        ) ?: testCreatePasswordRequestInfo()



        providerEnabledList = when (requestInfo.type) {

            RequestInfo.TYPE_CREATE ->