commit cc470bc084fd8cebc102e64d7f654916f8f5ae93
author Treehugger Robot <treehugger-gerrit@google.com> Fri Aug 13 22:16:15 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Aug 13 22:16:15 2021 +0000
tree 06bb16bb4740215e539eda967c9339317ea7232f
parent 17c942c7fd71674dae29d3fc9dcaa747c8a67b44
parent b4542cff95490cde8772f22de3879f6fc9e4594a

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

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

Change-Id: Ie71fa595c16823bc9fc87d6be5276449505d42ee

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