summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Helen Qin <helenqin@google.com> 2023-04-12 16:57:08 +0000
committer Helen Qin <helenqin@google.com> 2023-04-12 16:59:01 +0000
commitad083b7252aefcd3bed2098474c058d4fa9cb22d (patch)
treefdea92f89e7276787adfd68ff3817d3545f3e6e0
parent2bd76f5721fe2c5d90d25abb0e83215e2af28b8c (diff)
Switch to the new settings launch intent.
Bug: 277654929 Test: manual Change-Id: I2620728981fc413386c65cc8196cc5a9f1b5a6b6
-rw-r--r--packages/CredentialManager/src/com/android/credentialmanager/CredentialSelectorActivity.kt10
1 files 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 24f92c00c772..7581b5c0aa91 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"
+ }
}