Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7aaf2414 authored by Tyler Gunn's avatar Tyler Gunn
Browse files

Fixing issue where carrier name shows up in call log on single sim devices. 

Fixes a bug introduced in ag/608822.  Reverts the code for the
getAccountOrNull method and modifies getAccountColor to have the
special-case cose which was in getAccountOrNull.

Bug: 19248327
Change-Id: I558cdbd8d9994a1f07f82073ba35e9ec69693a2a
parent 7c35a8e9

src/com/android/dialer/calllog/PhoneAccountUtils.java

+9 −2
Original line number Diff line number Diff line
@@ -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;

    }

}