diff options
| author | Tyler Gunn <tgunn@google.com> | 2015-01-22 16:42:51 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-01-22 16:42:52 +0000 |
| commit | a1c9ef02e2e8122e283f187d89ca5032082464d7 (patch) | |
| tree | 714f5f432e9f1afdef91986e7cbb06dee031c9f5 | |
| parent | 25a7b6eb3c7116efb3d8ddebe7e002879be5f2fa (diff) | |
| parent | 211bccf2a3ad6c523930c1f159929678b9abc946 (diff) | |
| download | packages_apps_InCallUI-a1c9ef02e2e8122e283f187d89ca5032082464d7.tar.gz packages_apps_InCallUI-a1c9ef02e2e8122e283f187d89ca5032082464d7.tar.bz2 packages_apps_InCallUI-a1c9ef02e2e8122e283f187d89ca5032082464d7.zip | |
Merge "Ensure sim color is shown on multi-sim devices when only one sim installed." into lmp-mr1-dev
| -rw-r--r-- | src/com/android/incallui/InCallPresenter.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/com/android/incallui/InCallPresenter.java b/src/com/android/incallui/InCallPresenter.java index dc41d416..ce6d439d 100644 --- a/src/com/android/incallui/InCallPresenter.java +++ b/src/com/android/incallui/InCallPresenter.java @@ -1367,8 +1367,10 @@ public class InCallPresenter implements CallList.Listener, InCallPhoneListener { if (phoneAccountHandle != null) { final TelecomManager tm = getTelecomManager(); - if (tm != null && tm.hasMultipleCallCapableAccounts()) { + if (tm != null) { final PhoneAccount account = tm.getPhoneAccount(phoneAccountHandle); + // For single-sim devices, there will be no selected highlight color, so the phone + // account will default to NO_HIGHLIGHT_COLOR. if (account != null) { highlightColor = account.getHighlightColor(); } |