From ad083b7252aefcd3bed2098474c058d4fa9cb22d Mon Sep 17 00:00:00 2001 From: Helen Qin Date: Wed, 12 Apr 2023 16:57:08 +0000 Subject: [PATCH] Switch to the new settings launch intent. Bug: 277654929 Test: manual Change-Id: I2620728981fc413386c65cc8196cc5a9f1b5a6b6 --- .../credentialmanager/CredentialSelectorActivity.kt | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/packages/CredentialManager/src/com/android/credentialmanager/CredentialSelectorActivity.kt b/packages/CredentialManager/src/com/android/credentialmanager/CredentialSelectorActivity.kt index 24f92c00c7724..7581b5c0aa910 100644 --- a/packages/CredentialManager/src/com/android/credentialmanager/CredentialSelectorActivity.kt +++ b/packages/CredentialManager/src/com/android/credentialmanager/CredentialSelectorActivity.kt @@ -19,9 +19,9 @@ package com.android.credentialmanager import android.content.Intent import android.credentials.ui.BaseDialogResult import android.credentials.ui.RequestInfo +import android.net.Uri import android.os.Bundle import android.os.ResultReceiver -import android.provider.Settings import android.util.Log import androidx.activity.ComponentActivity import androidx.activity.compose.rememberLauncherForActivityResult @@ -192,7 +192,9 @@ class CredentialSelectorActivity : ComponentActivity() { this@CredentialSelectorActivity.finish() } else if (dialogState == DialogState.CANCELED_FOR_SETTINGS) { Log.d(Constants.LOG_TAG, "Received signal to finish the activity and launch settings.") - this@CredentialSelectorActivity.startActivity(Intent(Settings.ACTION_SYNC_SETTINGS)) + val settingsIntent = Intent(ACTION_CREDENTIAL_PROVIDER) + settingsIntent.data = Uri.parse("package:" + this.getPackageName()) + this@CredentialSelectorActivity.startActivity(settingsIntent) this@CredentialSelectorActivity.finish() } } @@ -222,4 +224,8 @@ class CredentialSelectorActivity : ComponentActivity() { dismissOnTimeout = true, ) } + + companion object { + const val ACTION_CREDENTIAL_PROVIDER = "android.settings.CREDENTIAL_PROVIDER" + } }