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

Commit de64f719 authored by Malcolm Chen's avatar Malcolm Chen
Browse files

In CarrierTextController replace getPhoneCount with getMaxPhoneCount. 

As first step for smooth single SIM to DSDS switch, for DSDS capable
deviced we always allocate objects as if it's in DSDS mode.

Bug: 141388730
Test: unittest and manual

Change-Id: I141689fc55063d87f4f7e5c605a461517beeabe4
Merged-In: I141689fc55063d87f4f7e5c605a461517beeabe4
parent f87292fa

packages/SystemUI/src/com/android/keyguard/CarrierTextController.java

+1 −1
Original line number Diff line number Diff line
@@ -172,7 +172,7 @@ public class CarrierTextController { 
        mSeparator = separator;

        mWakefulnessLifecycle = Dependency.get(WakefulnessLifecycle.class);

        mSimSlotsNumber = ((TelephonyManager) context.getSystemService(

                Context.TELEPHONY_SERVICE)).getPhoneCount();

                Context.TELEPHONY_SERVICE)).getMaxPhoneCount();

        mSimErrorState = new boolean[mSimSlotsNumber];

        updateDisplayOpportunisticSubscriptionCarrierText(SystemProperties.getBoolean(

                TelephonyProperties.DISPLAY_OPPORTUNISTIC_SUBSCRIPTION_CARRIER_TEXT_PROPERTY_NAME,

packages/SystemUI/tests/src/com/android/keyguard/CarrierTextControllerTest.java

+1 −1
Original line number Diff line number Diff line
@@ -112,7 +112,7 @@ public class CarrierTextControllerTest extends SysuiTestCase { 


        mCarrierTextCallbackInfo = new CarrierTextController.CarrierTextCallbackInfo("",

                new CharSequence[]{}, false, new int[]{});

        when(mTelephonyManager.getPhoneCount()).thenReturn(3);

        when(mTelephonyManager.getMaxPhoneCount()).thenReturn(3);



        mCarrierTextController = new TestCarrierTextController(mContext, SEPARATOR, true, true,

                mKeyguardUpdateMonitor);