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

Commit b4c8ebbe authored by Xiangyu/Malcolm Chen's avatar Xiangyu/Malcolm Chen Committed by android-build-merger
Browse files

Merge "Don't show signal bar of hidden Cellular subscription." am: 2f2a4199 

am: d5211044

Change-Id: I6b419270163b5fbfb72cc3a66d010782bd6eaf47
parents 31b70c28 d5211044

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

+2 −1
Original line number Diff line number Diff line
@@ -527,7 +527,8 @@ public class NetworkControllerImpl extends BroadcastReceiver 


    @VisibleForTesting

    void doUpdateMobileControllers() {

        List<SubscriptionInfo> subscriptions = mSubscriptionManager.getActiveSubscriptionInfoList();

        List<SubscriptionInfo> subscriptions = mSubscriptionManager

                .getActiveSubscriptionInfoList(true);

        if (subscriptions == null) {

            subscriptions = Collections.emptyList();

        }

packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/NetworkControllerBaseTest.java

+1 −0
Original line number Diff line number Diff line
@@ -182,6 +182,7 @@ public class NetworkControllerBaseTest extends SysuiTestCase { 
            subs.add(subscription);

        }

        when(mMockSm.getActiveSubscriptionInfoList()).thenReturn(subs);

        when(mMockSm.getActiveSubscriptionInfoList(anyBoolean())).thenReturn(subs);

        mNetworkController.doUpdateMobileControllers();

    }