commit 4e185ac6184e6b18d8f8d9920494b8ae6dc2e4b3
author Xin Li <delphij@google.com> Sat Aug 14 06:31:01 2021 +0000
committer Xin Li <delphij@google.com> Sat Aug 14 06:31:01 2021 +0000
tree 06bb16bb4740215e539eda967c9339317ea7232f
parent b4542cff95490cde8772f22de3879f6fc9e4594a
parent 17c942c7fd71674dae29d3fc9dcaa747c8a67b44

Merge sc-dev-plus-aosp-without-vendor@7634622

Merged-In: I975ce2e612e979884c82ef9da6e70b70dce076aa
Change-Id: I269ea522ba7356dca0bfa43e8a8ee8acdba7b7a2

java/com/android/dialer/speeddial/database/SpeedDialEntryDatabaseHelper.java

diff --git a/java/com/android/dialer/speeddial/database/SpeedDialEntryDatabaseHelper.java b/java/com/android/dialer/speeddial/database/SpeedDialEntryDatabaseHelper.java
index 211af86..caba77f 100644
--- a/java/com/android/dialer/speeddial/database/SpeedDialEntryDatabaseHelper.java
+++ b/java/com/android/dialer/speeddial/database/SpeedDialEntryDatabaseHelper.java
@@ -125,7 +125,7 @@
               Channel.builder()
                   .setNumber(number)
                   .setPhoneType(cursor.getInt(POSITION_PHONE_TYPE))
-                  .setLabel(Optional.of(cursor.getString(POSITION_PHONE_LABEL)).or(""))
+                  .setLabel(Optional.fromNullable(cursor.getString(POSITION_PHONE_LABEL)).or(""))
                   .setTechnology(cursor.getInt(POSITION_PHONE_TECHNOLOGY))
                   .build();
         }