summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTyler Gunn <tgunn@google.com>2015-01-05 16:34:47 -0800
committerTyler Gunn <tgunn@google.com>2015-01-13 18:36:05 +0000
commitb1a723bf6e5c77b216090054bb8bf35d006c6244 (patch)
tree83f156ca5fffccbc318146c62ca5ef4959b5cd50
parentaec15e0719ad5f01dcf48ae9e13311140bdadae4 (diff)
Ensure sim color is shown on multi-sim devices when only one sim installed.
- Removed telecomManager check hasMultipleCallCapableAccounts() which would only return 1 when a single sim is installed in a multisim phone. - For single-sim devices, the Sim color is 0 (ie not selected) for the Sim PhoneAccount, so the default behavior is to not show a sim color. Bug: 18696518 Change-Id: I3968e181a41244092d2058fcf3dc8d627d12b412
-rw-r--r--InCallUI/src/com/android/incallui/InCallPresenter.java4
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();
}