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

Merge "Support the mdoc component name format." into udc-dev

Browse Source
This commit is contained in:
Helen Qin
2023-03-29 16:40:04 +00:00
committed by Android (Google) Code Review
parent 1949caea12 f6f64e59f9
commit 8678e533fe
1 changed files with 18 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -102,7 +102,7 @@ private fun getServiceLabelAndIcon(
).toString()
providerIcon = pkgInfo.applicationInfo.loadIcon(pm)
} catch (e: PackageManager.NameNotFoundException) {
Log.e(Constants.LOG_TAG, "Provider info not found", e)
Log.e(Constants.LOG_TAG, "Provider package info not found", e)
}
} else {
try {
@@ -113,7 +113,23 @@ private fun getServiceLabelAndIcon(
).toString()
providerIcon = si.loadIcon(pm)
} catch (e: PackageManager.NameNotFoundException) {
Log.e(Constants.LOG_TAG, "Provider info not found", e)
Log.e(Constants.LOG_TAG, "Provider service info not found", e)
// Added for mdoc use case where the provider may not need to register a service and
// instead only relies on the registration api.
try {
val pkgInfo = pm.getPackageInfo(
component.packageName,
PackageManager.PackageInfoFlags.of(0)
)
providerLabel =
pkgInfo.applicationInfo.loadSafeLabel(
pm, 0f,
TextUtils.SAFE_STRING_FLAG_FIRST_LINE or TextUtils.SAFE_STRING_FLAG_TRIM
).toString()
providerIcon = pkgInfo.applicationInfo.loadIcon(pm)
} catch (e: PackageManager.NameNotFoundException) {
Log.e(Constants.LOG_TAG, "Provider package info not found", e)
}
}
}
return if (providerLabel == null || providerIcon == null) {