From e5a86aaf74ee1cc672c9d2adef866765fc11591c Mon Sep 17 00:00:00 2001 From: Helen Qin Date: Fri, 3 Feb 2023 21:32:22 +0000 Subject: [PATCH] Use safe calls for icons. Fix: 267767229 Test: local deployment Change-Id: Iad8b6d55046c5d06c2dfe652bad8f502a394b3f6 --- .../src/com/android/credentialmanager/DataConverter.kt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/CredentialManager/src/com/android/credentialmanager/DataConverter.kt b/packages/CredentialManager/src/com/android/credentialmanager/DataConverter.kt index d8420cdd7ff1a..15acd8c458a21 100644 --- a/packages/CredentialManager/src/com/android/credentialmanager/DataConverter.kt +++ b/packages/CredentialManager/src/com/android/credentialmanager/DataConverter.kt @@ -198,7 +198,7 @@ class GetFlowUtils { credentialTypeDisplayName = credentialEntry.typeDisplayName.toString(), userName = credentialEntry.username.toString(), displayName = credentialEntry.displayName?.toString(), - icon = credentialEntry.icon.loadDrawable(context), + icon = credentialEntry.icon?.loadDrawable(context), lastUsedTimeMillis = credentialEntry.lastUsedTime, )) } @@ -213,7 +213,7 @@ class GetFlowUtils { credentialTypeDisplayName = credentialEntry.typeDisplayName.toString(), userName = credentialEntry.username.toString(), displayName = credentialEntry.displayName?.toString(), - icon = credentialEntry.icon.loadDrawable(context), + icon = credentialEntry.icon?.loadDrawable(context), lastUsedTimeMillis = credentialEntry.lastUsedTime, )) } @@ -228,7 +228,7 @@ class GetFlowUtils { credentialTypeDisplayName = credentialEntry.typeDisplayName.toString(), userName = credentialEntry.title.toString(), displayName = credentialEntry.subtitle?.toString(), - icon = credentialEntry.icon.loadDrawable(context), + icon = credentialEntry.icon?.loadDrawable(context), lastUsedTimeMillis = credentialEntry.lastUsedTime, )) }