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 | |
| parent | 70ebcc7cd0879077dbe47b62138642bbed35811a (diff) | |
| parent | de9dde6a0b9362187a9b44c0c2603bf968017064 (diff) | |
Merge "Fix NPE when querying preferred without an account"
| -rw-r--r-- | java/com/android/dialer/precall/impl/CallingAccountSelector.java | 2 | ||||
| -rw-r--r-- | java/com/android/dialer/preferredsim/suggestion/SuggestionProvider.java | 2 |
2 files changed, 3 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)); } } diff --git a/java/com/android/dialer/preferredsim/suggestion/SuggestionProvider.java b/java/com/android/dialer/preferredsim/suggestion/SuggestionProvider.java index abb6e980a..0a91d1511 100644 --- a/java/com/android/dialer/preferredsim/suggestion/SuggestionProvider.java +++ b/java/com/android/dialer/preferredsim/suggestion/SuggestionProvider.java @@ -38,6 +38,8 @@ public interface SuggestionProvider { USER_SET, // The user has selected the SIM for all contacts on the account. ACCOUNT, + // Unspecified reason. + OTHER, } /** The suggestion. */ |