diff options
author | Tyler Gunn <tgunn@google.com> | 2015-02-04 16:39:19 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2015-02-04 16:39:19 +0000 |
commit | f4f09521c20134fb2690c6a58e4ce203e0055d9c (patch) | |
tree | 360beb1345aa98a9a027e007341bbbfc2c83bf5d | |
parent | a69931938e85735a5762ef108a71b10850e59a2d (diff) | |
parent | 2e7ea428be632749f9e1a2b716e09fd493028547 (diff) |
am 2e7ea428: am 7aaf2414: Fixing issue where carrier name shows up in call log on single sim devices.
* commit '2e7ea428be632749f9e1a2b716e09fd493028547':
Fixing issue where carrier name shows up in call log on single sim devices.
-rw-r--r-- | src/com/android/dialer/calllog/PhoneAccountUtils.java | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/src/com/android/dialer/calllog/PhoneAccountUtils.java b/src/com/android/dialer/calllog/PhoneAccountUtils.java index f9bd9ad4a..f80ffd089 100644 --- a/src/com/android/dialer/calllog/PhoneAccountUtils.java +++ b/src/com/android/dialer/calllog/PhoneAccountUtils.java @@ -74,20 +74,27 @@ public class PhoneAccountUtils { * Extract account color from PhoneAccount object. */ public static int getAccountColor(Context context, PhoneAccountHandle accountHandle) { - PhoneAccount account = getAccountOrNull(context, accountHandle); + TelecomManager telecomManager = + (TelecomManager) context.getSystemService(Context.TELECOM_SERVICE); + final PhoneAccount account = telecomManager.getPhoneAccount(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. + * Retrieve the account metadata, but if the account does not exist or the device has only a + * single registered and enabled account, return null. */ private static PhoneAccount getAccountOrNull(Context context, PhoneAccountHandle accountHandle) { TelecomManager telecomManager = (TelecomManager) context.getSystemService(Context.TELECOM_SERVICE); final PhoneAccount account = telecomManager.getPhoneAccount(accountHandle); + if (!telecomManager.hasMultipleCallCapableAccounts()) { + return null; + } return account; } } |