summaryrefslogtreecommitdiff
path: root/java/com/android/dialer/speeddial
diff options
context:
space:
mode:
authorcalderwoodra <calderwoodra@google.com>2018-05-14 12:12:45 -0700
committerCopybara-Service <copybara-piper@google.com>2018-05-15 11:12:27 -0700
commitdb5a8c1a2546b68c8e663b00ed2e75c5df6716e3 (patch)
tree723b7b1043ab318f66475e28e3c2a690456272d5 /java/com/android/dialer/speeddial
parent61640759ebc72fb646a1edb77bd8748584e756d6 (diff)
Don't crash when cp2 returns a null label.
Bug: 79260760 Test: n/a PiperOrigin-RevId: 196547205 Change-Id: Ic3c39a920ea759e5fc2b03f5022c5f2cc7ed3f8c
Diffstat (limited to 'java/com/android/dialer/speeddial')
-rw-r--r--java/com/android/dialer/speeddial/database/SpeedDialEntryDatabaseHelper.java2
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 1416a203d..211af86ad 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(cursor.getString(POSITION_PHONE_LABEL))
+ .setLabel(Optional.of(cursor.getString(POSITION_PHONE_LABEL)).or(""))
.setTechnology(cursor.getInt(POSITION_PHONE_TECHNOLOGY))
.build();
}