Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Make disabledProviderList nullable"

Browse Source
This commit is contained in:
Qinmei Du
2022-12-01 16:59:14 +00:00
committed by Android (Google) Code Review
parent 916368dfc4 a3d3414c53
commit 685031abae
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
packages/CredentialManager/src/com/android/credentialmanager/CredentialManagerRepo.kt
View File

@@ -59,7 +59,7 @@ class CredentialManagerRepo(
) {
val requestInfo: RequestInfo
private val providerEnabledList: List<ProviderData>
private val providerDisabledList: List<DisabledProviderData>
private val providerDisabledList: List<DisabledProviderData>?
// TODO: require non-null.
val resultReceiver: ResultReceiver?
@@ -143,7 +143,7 @@ class CredentialManagerRepo(
providerEnabledList as List<CreateCredentialProviderData>, requestDisplayInfo, context)
val providerDisabledList = CreateFlowUtils.toDisabledProviderList(
// Handle runtime cast error
providerDisabledList as List<DisabledProviderData>, context)
providerDisabledList, context)
var defaultProvider: EnabledProviderInfo? = null
var remoteEntry: RemoteInfo? = null
providerEnabledList.forEach{providerInfo -> providerInfo.createOptions =
@@ -209,7 +209,7 @@ class CredentialManagerRepo(
)
}
private fun testDisabledProviderList(): List<DisabledProviderData> {
private fun testDisabledProviderList(): List<DisabledProviderData>? {
return listOf(
DisabledProviderData("com.lastpass.lpandroid"),
DisabledProviderData("com.google.android.youtube")

6
packages/CredentialManager/src/com/android/credentialmanager/DataConverter.kt
View File

@@ -209,12 +209,12 @@ class CreateFlowUtils {
}
fun toDisabledProviderList(
providerDataList: List<DisabledProviderData>,
providerDataList: List<DisabledProviderData>?,
context: Context,
): List<com.android.credentialmanager.createflow.DisabledProviderInfo> {
): List<com.android.credentialmanager.createflow.DisabledProviderInfo>? {
// TODO: get from the actual service info
val packageManager = context.packageManager
return providerDataList.map {
return providerDataList?.map {
val pkgInfo = packageManager
.getPackageInfo(it.providerFlattenedComponentName,
PackageManager.PackageInfoFlags.of(0))