diff options
author | Treehugger Robot <treehugger-gerrit@google.com> | 2018-02-07 00:32:01 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2018-02-07 00:32:01 +0000 |
commit | 3b42bce613b3c57ad5e4a85fdd713553c7ed56eb (patch) | |
tree | 2c66fbd543a3d59d7baa9fd2feb924b7ee22739c /java/com/android/dialer/precall/impl/CallingAccountSelector.java | |
parent | 70ebcc7cd0879077dbe47b62138642bbed35811a (diff) | |
parent | de9dde6a0b9362187a9b44c0c2603bf968017064 (diff) |
Merge "Fix NPE when querying preferred without an account"
Diffstat (limited to 'java/com/android/dialer/precall/impl/CallingAccountSelector.java')
-rw-r--r-- | java/com/android/dialer/precall/impl/CallingAccountSelector.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/java/com/android/dialer/precall/impl/CallingAccountSelector.java b/java/com/android/dialer/precall/impl/CallingAccountSelector.java index f014b270b..43f668084 100644 --- a/java/com/android/dialer/precall/impl/CallingAccountSelector.java +++ b/java/com/android/dialer/precall/impl/CallingAccountSelector.java @@ -388,7 +388,7 @@ public class CallingAccountSelector implements PreCallAction { if (cursor == null || !cursor.moveToFirst()) { return Optional.absent(); } - return Optional.of(cursor.getString(0)); + return Optional.fromNullable(cursor.getString(0)); } } |