diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2018-02-02 02:16:57 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2018-02-02 02:16:57 +0000 |
| commit | 1fe9bec25a26587f792202358f14f3ca5b575cf7 (patch) | |
| tree | 31b457317a4182d97f3dc23d20591e159e3a5501 /java/com/android/dialer | |
| parent | f765d94d1c3b7e03e20333608e9b5dd07af38b73 (diff) | |
| parent | 974fc2903d4ecd0d8392a02b988982d24a2e93f4 (diff) | |
Merge changes I50927036,I7154058a
* changes:
internal change
Add suggestion reason ACCOUNT
Diffstat (limited to 'java/com/android/dialer')
| -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 e92832947..8d7d75952 100644 --- a/java/com/android/dialer/precall/impl/CallingAccountSelector.java +++ b/java/com/android/dialer/precall/impl/CallingAccountSelector.java @@ -266,7 +266,7 @@ public class CallingAccountSelector implements PreCallAction { hints.add(context.getString(R.string.pre_call_select_phone_account_hint_frequent)); break; default: - throw Assert.createAssertionFailException("unexpected reason " + suggestion.reason); + LogUtil.w("CallingAccountSelector.buildHint", "unhandled reason " + suggestion.reason); } } return hints; diff --git a/java/com/android/dialer/preferredsim/suggestion/SuggestionProvider.java b/java/com/android/dialer/preferredsim/suggestion/SuggestionProvider.java index bb50889ec..abb6e980a 100644 --- a/java/com/android/dialer/preferredsim/suggestion/SuggestionProvider.java +++ b/java/com/android/dialer/preferredsim/suggestion/SuggestionProvider.java @@ -36,6 +36,8 @@ public interface SuggestionProvider { // The user has select the SIM for this category of calls (contacts from certain accounts, // etc.). USER_SET, + // The user has selected the SIM for all contacts on the account. + ACCOUNT, } /** The suggestion. */ |