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

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

1 files changed, 3 insertions, 1 deletions

diff --git a/InCallUI/src/com/android/incallui/InCallPresenter.java b/InCallUI/src/com/android/incallui/InCallPresenter.java
index dc41d416e..ce6d439d1 100644
--- a/InCallUI/src/com/android/incallui/InCallPresenter.java
+++ b/InCallUI/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();
                 }