commit 4b4b96883c65dbba5689790e1539ecc59245b32b
author Treehugger Robot <treehugger-gerrit@google.com> Fri Aug 13 22:54:55 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Aug 13 22:54:55 2021 +0000
tree 06bb16bb4740215e539eda967c9339317ea7232f
parent 5f93ff02d1464c76941cb91c71209a8e25bc528e
parent 42496f80365586783868f92bbb95c2023aee6c28

Merge "Use Option.ofNullable instead of Optional.of" am: a85c99c791 am: b4542cff95 am: cc470bc084 am: 42496f8036

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Dialer/+/1792941

Change-Id: I07ee4d3ea63dfb24d33a3555cf618e5941f1a9aa

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