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

Commit 51a5e36b authored by Sooraj Sasindran's avatar Sooraj Sasindran Committed by Android (Google) Code Review
Browse files

Merge "change getActiveAndHiddenSubscriptionInfoList API name"

parents 72358e53 feb6aa47

api/current.txt

+1 −1
Original line number Diff line number Diff line
@@ -48058,13 +48058,13 @@ package android.telephony { 
    method @NonNull @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public android.os.ParcelUuid createSubscriptionGroup(@NonNull java.util.List<java.lang.Integer>);

    method @Deprecated public static android.telephony.SubscriptionManager from(android.content.Context);

    method public java.util.List<android.telephony.SubscriptionInfo> getAccessibleSubscriptionInfoList();

    method @Nullable public java.util.List<android.telephony.SubscriptionInfo> getActiveAndHiddenSubscriptionInfoList();

    method public static int getActiveDataSubscriptionId();

    method @RequiresPermission(android.Manifest.permission.READ_PHONE_STATE) public android.telephony.SubscriptionInfo getActiveSubscriptionInfo(int);

    method @RequiresPermission(android.Manifest.permission.READ_PHONE_STATE) public int getActiveSubscriptionInfoCount();

    method public int getActiveSubscriptionInfoCountMax();

    method @RequiresPermission(android.Manifest.permission.READ_PHONE_STATE) public android.telephony.SubscriptionInfo getActiveSubscriptionInfoForSimSlotIndex(int);

    method @RequiresPermission(android.Manifest.permission.READ_PHONE_STATE) public java.util.List<android.telephony.SubscriptionInfo> getActiveSubscriptionInfoList();

    method @NonNull public java.util.List<android.telephony.SubscriptionInfo> getCompleteActiveSubscriptionInfoList();

    method public static int getDefaultDataSubscriptionId();

    method public static int getDefaultSmsSubscriptionId();

    method public static int getDefaultSubscriptionId();

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

+3 −3
Original line number Diff line number Diff line
@@ -379,7 +379,7 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener, Dumpab 
        if (DEBUG_SIM_STATES) {

            Log.v(TAG, "onSubscriptionInfoChanged()");

            List<SubscriptionInfo> sil = mSubscriptionManager

                    .getActiveAndHiddenSubscriptionInfoList();

                    .getCompleteActiveSubscriptionInfoList();

            if (sil != null) {

                for (SubscriptionInfo subInfo : sil) {

                    Log.v(TAG, "SubInfo:" + subInfo);
@@ -433,10 +433,10 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener, Dumpab 
    public List<SubscriptionInfo> getSubscriptionInfo(boolean forceReload) {

        List<SubscriptionInfo> sil = mSubscriptionInfo;

        if (sil == null || forceReload) {

            sil = mSubscriptionManager.getActiveAndHiddenSubscriptionInfoList();

            sil = mSubscriptionManager.getCompleteActiveSubscriptionInfoList();

        }

        if (sil == null) {

            // getActiveAndHiddenSubscriptionInfoList was null callers expect an empty list.

            // getCompleteActiveSubscriptionInfoList was null callers expect an empty list.

            mSubscriptionInfo = new ArrayList<SubscriptionInfo>();

        } else {

            mSubscriptionInfo = sil;

packages/SystemUI/src/com/android/systemui/statusbar/policy/NetworkControllerImpl.java

+1 −1
Original line number Diff line number Diff line
@@ -630,7 +630,7 @@ public class NetworkControllerImpl extends BroadcastReceiver 
    @VisibleForTesting

    void doUpdateMobileControllers() {

        List<SubscriptionInfo> subscriptions = mSubscriptionManager

                .getActiveAndHiddenSubscriptionInfoList();

                .getCompleteActiveSubscriptionInfoList();

        if (subscriptions == null) {

            subscriptions = Collections.emptyList();

        }

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

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


        // STOPSHIP(b/130246708) This line makes sure that SubscriptionManager provides the

        // same answer as KeyguardUpdateMonitor. Remove when this is addressed

        when(mSubscriptionManager.getActiveAndHiddenSubscriptionInfoList()).thenReturn(

        when(mSubscriptionManager.getCompleteActiveSubscriptionInfoList()).thenReturn(

                new ArrayList<>());



        when(mKeyguardUpdateMonitor.getSimState(anyInt())).thenReturn(

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

+1 −1
Original line number Diff line number Diff line
@@ -516,7 +516,7 @@ public class KeyguardUpdateMonitorTest extends SysuiTestCase { 
        List<SubscriptionInfo> list = new ArrayList<>();

        list.add(TEST_SUBSCRIPTION);

        list.add(TEST_SUBSCRIPTION_2);

        when(mSubscriptionManager.getActiveAndHiddenSubscriptionInfoList()).thenReturn(list);

        when(mSubscriptionManager.getCompleteActiveSubscriptionInfoList()).thenReturn(list);

        mKeyguardUpdateMonitor.mPhoneStateListener.onActiveDataSubscriptionIdChanged(

                TEST_SUBSCRIPTION_2.getSubscriptionId());

        mTestableLooper.processAllMessages();