summaryrefslogtreecommitdiff
path: root/src/com/android/car
diff options
context:
space:
mode:
authorUchenna Okoye <uokoye@google.com>2021-07-01 16:18:45 -0700
committerUchenna Okoye <uokoye@google.com>2021-07-01 23:34:46 +0000
commit5f75ba35cd530e9d34ca187007193a2b12d70fbf (patch)
tree63835d115f2878d8fa99edc1c25606f7891e0d09 /src/com/android/car
parent2982a6a4d78db50e51cf1e8675a1dd84c5f0b884 (diff)
downloadMessenger-5f75ba35cd530e9d34ca187007193a2b12d70fbf.tar.gz
Project import generated by Copybara.
PiperOrigin-RevId: 382626868 Change-Id: I6be0527e4edc8cc6226b70a08e9282a9323edc16 Bug: 192598216
Diffstat (limited to 'src/com/android/car')
-rw-r--r--src/com/android/car/messenger/impl/datamodels/UserAccountLiveData.java5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/com/android/car/messenger/impl/datamodels/UserAccountLiveData.java b/src/com/android/car/messenger/impl/datamodels/UserAccountLiveData.java
index de96b65..8defc5f 100644
--- a/src/com/android/car/messenger/impl/datamodels/UserAccountLiveData.java
+++ b/src/com/android/car/messenger/impl/datamodels/UserAccountLiveData.java
@@ -95,7 +95,10 @@ public class UserAccountLiveData extends LiveData<UserAccountChangeList> {
it -> {
int subscriptionId = it.getSubscriptionId();
String iccId = it.getIccId();
- String displayName = it.getDisplayName().toString();
+ String displayName =
+ it.getDisplayName() != null
+ ? it.getDisplayName().toString()
+ : "";
return new UserAccount(
subscriptionId, displayName, iccId, Instant.now());
})