summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--packages/CredentialManager/src/com/android/credentialmanager/DataConverter.kt10
1 files changed, 8 insertions, 2 deletions
diff --git a/packages/CredentialManager/src/com/android/credentialmanager/DataConverter.kt b/packages/CredentialManager/src/com/android/credentialmanager/DataConverter.kt
index 48aebec606d0..93f566ce783b 100644
--- a/packages/CredentialManager/src/com/android/credentialmanager/DataConverter.kt
+++ b/packages/CredentialManager/src/com/android/credentialmanager/DataConverter.kt
@@ -230,9 +230,15 @@ class CreateFlowUtils {
// TODO: get from the actual service info
val packageManager = context.packageManager
return providerDataList?.map {
+ val componentName = ComponentName.unflattenFromString(it.providerFlattenedComponentName)
+ var packageName = componentName?.packageName
+ if (componentName == null) {
+ // TODO: Remove once test data is fixed
+ packageName = it.providerFlattenedComponentName
+ }
val pkgInfo = packageManager
- .getPackageInfo(it.providerFlattenedComponentName,
- PackageManager.PackageInfoFlags.of(0))
+ .getPackageInfo(packageName,
+ PackageManager.PackageInfoFlags.of(0))
DisabledProviderInfo(
icon = pkgInfo.applicationInfo.loadIcon(packageManager)!!,
name = it.providerFlattenedComponentName,