commit 74b1dd97d839fff2f70bdade2b82c4448a22e964
author Cole Faust <colefaust@google.com> Wed Aug 11 17:03:27 2021 -0700
committer Cole Faust <colefaust@google.com> Wed Aug 11 17:26:52 2021 -0700
tree 5cb0efdd25f4479361daac9d1fc06e76ac6e7292
parent e98287809e72d4468dc4fbafcdcf349e1c5d0ca0

Use Option.ofNullable instead of Optional.of

Optional.of expects a non-null value, and throws a
NullPointerException if it gets null.

This needs to be fixed to upgrade errorprone to v3.8.1.

Bug: 190944875
Test: Presubmits
Change-Id: I38b5d80ec8c1e2dc93d76e08a0d0051fc4127ab3

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