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

Commit 4cc64e9e authored by Helen Qin's avatar Helen Qin Committed by Android (Google) Code Review
Browse files

Merge "Switch to the new settings launch intent." into udc-dev

parents 456fe77d ad083b72

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

+8 −2
Original line number Original line Diff line number Diff line
@@ -19,9 +19,9 @@ package com.android.credentialmanager 
import android.content.Intent

import android.content.Intent

import android.credentials.ui.BaseDialogResult

import android.credentials.ui.BaseDialogResult

import android.credentials.ui.RequestInfo

import android.credentials.ui.RequestInfo

import android.net.Uri

import android.os.Bundle

import android.os.Bundle

import android.os.ResultReceiver

import android.os.ResultReceiver

import android.provider.Settings

import android.util.Log

import android.util.Log

import androidx.activity.ComponentActivity

import androidx.activity.ComponentActivity

import androidx.activity.compose.rememberLauncherForActivityResult

import androidx.activity.compose.rememberLauncherForActivityResult
@@ -192,7 +192,9 @@ class CredentialSelectorActivity : ComponentActivity() { 
            this@CredentialSelectorActivity.finish()

            this@CredentialSelectorActivity.finish()

        } else if (dialogState == DialogState.CANCELED_FOR_SETTINGS) {

        } else if (dialogState == DialogState.CANCELED_FOR_SETTINGS) {

            Log.d(Constants.LOG_TAG, "Received signal to finish the activity and launch 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()

            this@CredentialSelectorActivity.finish()

        }

        }

    }

    }
@@ -222,4 +224,8 @@ class CredentialSelectorActivity : ComponentActivity() { 
            dismissOnTimeout = true,

            dismissOnTimeout = true,

        )

        )

    }

    }



    companion object {

        const val ACTION_CREDENTIAL_PROVIDER = "android.settings.CREDENTIAL_PROVIDER"

    }

}
 
}