commit db5a8c1a2546b68c8e663b00ed2e75c5df6716e3
author calderwoodra <calderwoodra@google.com> Mon May 14 12:12:45 2018 -0700
committer Copybara-Service <copybara-piper@google.com> Tue May 15 11:12:27 2018 -0700
tree 723b7b1043ab318f66475e28e3c2a690456272d5
parent 61640759ebc72fb646a1edb77bd8748584e756d6

Don't crash when cp2 returns a null label.

Bug: 79260760
Test: n/a
PiperOrigin-RevId: 196547205
Change-Id: Ic3c39a920ea759e5fc2b03f5022c5f2cc7ed3f8c

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 1416a20..211af86 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(cursor.getString(POSITION_PHONE_LABEL))
+                  .setLabel(Optional.of(cursor.getString(POSITION_PHONE_LABEL)).or(""))
                   .setTechnology(cursor.getInt(POSITION_PHONE_TECHNOLOGY))
                   .build();
         }