commit 425e86338cee8627c36aacee9f139011a42192b4
author Tyler Gunn <tgunn@google.com> Thu Jan 22 19:59:22 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Thu Jan 22 19:59:22 2015 +0000
tree 4d2a4850c2de030bf4d7e9542c14cedab6d2d65c
parent a58d28489304b289cbc01a1242faa6415d224336
parent 06d2d8f0478ab16342622dcad07ae9436a2058c6

am 72d03649: am a1c9ef02: Merge "Ensure sim color is shown on multi-sim devices when only one sim installed." into lmp-mr1-dev

* commit '72d036495812e503c56cbfbea8d722c21a74288e':
  Ensure sim color is shown on multi-sim devices when only one sim installed.

InCallUI/src/com/android/incallui/InCallPresenter.java

diff --git a/InCallUI/src/com/android/incallui/InCallPresenter.java b/InCallUI/src/com/android/incallui/InCallPresenter.java
index dc41d41..ce6d439 100644
--- a/InCallUI/src/com/android/incallui/InCallPresenter.java
+++ b/InCallUI/src/com/android/incallui/InCallPresenter.java
@@ -1367,8 +1367,10 @@
         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();
                 }