Merge "Fix NPE when querying preferred without an account"

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. */