From b3772482c13299820c4ece8a3c14cd2f46f18e63 Mon Sep 17 00:00:00 2001 From: Tyler Gunn Date: Mon, 5 Jan 2015 16:33:46 -0800 Subject: 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: I8bbb956e204422e122b3c50e6fc98c2916151aa4 --- src/com/android/dialer/calllog/PhoneAccountUtils.java | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'src') diff --git a/src/com/android/dialer/calllog/PhoneAccountUtils.java b/src/com/android/dialer/calllog/PhoneAccountUtils.java index adeec0f2b..f9bd9ad4a 100644 --- a/src/com/android/dialer/calllog/PhoneAccountUtils.java +++ b/src/com/android/dialer/calllog/PhoneAccountUtils.java @@ -75,21 +75,19 @@ public class PhoneAccountUtils { */ public static int getAccountColor(Context context, PhoneAccountHandle accountHandle) { PhoneAccount account = getAccountOrNull(context, accountHandle); + // For single-sim devices the PhoneAccount will be NO_HIGHLIGHT_COLOR by default, so it is + // safe to always use the account highlight color. return account == null ? PhoneAccount.NO_HIGHLIGHT_COLOR : account.getHighlightColor(); } /** - * Retrieve the account metadata, but if the account does not exist or the device has only a - * single registered and enabled account, return null. + * Retrieve the account metadata. */ private static PhoneAccount getAccountOrNull(Context context, PhoneAccountHandle accountHandle) { TelecomManager telecomManager = (TelecomManager) context.getSystemService(Context.TELECOM_SERVICE); final PhoneAccount account = telecomManager.getPhoneAccount(accountHandle); - if (account == null || !telecomManager.hasMultipleCallCapableAccounts()) { - return null; - } return account; } } -- cgit v1.2.3