commit a85c99c79149f7f9120d3a3d6beeed0f91aa81b1
author Treehugger Robot <treehugger-gerrit@google.com> Fri Aug 13 21:32:21 2021 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Aug 13 21:32:21 2021 +0000
tree 5cb0efdd25f4479361daac9d1fc06e76ac6e7292
parent e98287809e72d4468dc4fbafcdcf349e1c5d0ca0
parent 74b1dd97d839fff2f70bdade2b82c4448a22e964

Merge "Use Option.ofNullable instead of Optional.of"

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();
         }