From 3d86230437e84ef7a54c4ea97b07c28d79f47d1f Mon Sep 17 00:00:00 2001
From: Reema Bajwa <reemabajwa@google.com>
Date: Mon, 2 Jan 2023 00:09:25 +0000
Subject: [PATCH] Fix package name usage for disabled providers

Test: Locally built & deployed

Change-Id: I1cfb2f39aae3db2257d971b07eeb82901d422690
---
 .../src/com/android/credentialmanager/DataConverter.kt | 10 ++++++++--
 1 file 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 48aebec606d0d..93f566ce783b3 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,