diff options
| author | 2023-05-05 02:26:39 +0000 | |
|---|---|---|
| committer | 2023-05-05 02:26:39 +0000 | |
| commit | 217d64daaa8ceb7e9919aa772fd43cf4e0f8e8bf (patch) | |
| tree | 0b0d128ac971042ceb2df96369e45b8d736694c4 | |
| parent | c246ee42f1677d831378b8d9745d6e59d92d4d91 (diff) | |
| parent | d2786a80ca38489b4fcbb59ad4f7b2f104a10893 (diff) | |
Merge "Fix the null toString logic." into udc-dev
| -rw-r--r-- | packages/CredentialManager/src/com/android/credentialmanager/DataConverter.kt | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/packages/CredentialManager/src/com/android/credentialmanager/DataConverter.kt b/packages/CredentialManager/src/com/android/credentialmanager/DataConverter.kt index a35310cdad95..fcf8c6cd85d9 100644 --- a/packages/CredentialManager/src/com/android/credentialmanager/DataConverter.kt +++ b/packages/CredentialManager/src/com/android/credentialmanager/DataConverter.kt @@ -286,7 +286,8 @@ class GetFlowUtils { pendingIntent = credentialEntry.pendingIntent, fillInIntent = it.frameworkExtrasIntent, credentialType = CredentialType.UNKNOWN, - credentialTypeDisplayName = credentialEntry.typeDisplayName.toString(), + credentialTypeDisplayName = + credentialEntry.typeDisplayName?.toString().orEmpty(), userName = credentialEntry.title.toString(), displayName = credentialEntry.subtitle?.toString(), icon = credentialEntry.icon.loadDrawable(context), |