Merge "Fix package name usage for disabled providers"

2023-01-05 20:23:20 +00:00
parent 51a4fd9534 3d86230437
commit bdc55a7b49
1 changed files with 8 additions and 2 deletions
--- 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,