diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2021-08-13 22:16:15 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-08-13 22:16:15 +0000 |
| commit | cc470bc084fd8cebc102e64d7f654916f8f5ae93 (patch) | |
| tree | 06bb16bb4740215e539eda967c9339317ea7232f /java/com | |
| parent | 17c942c7fd71674dae29d3fc9dcaa747c8a67b44 (diff) | |
| parent | b4542cff95490cde8772f22de3879f6fc9e4594a (diff) | |
| download | Dialer-cc470bc084fd8cebc102e64d7f654916f8f5ae93.tar.gz | |
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
Diffstat (limited to 'java/com')
| -rw-r--r-- | java/com/android/dialer/speeddial/database/SpeedDialEntryDatabaseHelper.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/java/com/android/dialer/speeddial/database/SpeedDialEntryDatabaseHelper.java b/java/com/android/dialer/speeddial/database/SpeedDialEntryDatabaseHelper.java index 211af86ad..caba77f12 100644 --- a/java/com/android/dialer/speeddial/database/SpeedDialEntryDatabaseHelper.java +++ b/java/com/android/dialer/speeddial/database/SpeedDialEntryDatabaseHelper.java @@ -125,7 +125,7 @@ public final class SpeedDialEntryDatabaseHelper extends SQLiteOpenHelper 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(); } |