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

Commit cbe24f4b authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Remove parameter that is always false and never used in the method."... 

Merge "Remove parameter that is always false and never used in the method." into tm-qpr-dev am: 29835fbf

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20063848



Change-Id: I64bee901dba16589af097a7bb2d956a502db9941
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 65ce6fb7 29835fbf

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

+1 −1
Original line number Diff line number Diff line
@@ -293,7 +293,7 @@ public class CarrierTextManager { 
    }



    protected List<SubscriptionInfo> getSubscriptionInfo() {

        return mKeyguardUpdateMonitor.getFilteredSubscriptionInfo(false);

        return mKeyguardUpdateMonitor.getFilteredSubscriptionInfo();

    }



    protected void updateCarrierText() {

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

+1 −1
Original line number Diff line number Diff line
@@ -620,7 +620,7 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener, Dumpab 
     * of them based on carrier config. e.g. In this case we should only show one carrier name

     * on the status bar and quick settings.

     */

    public List<SubscriptionInfo> getFilteredSubscriptionInfo(boolean forceReload) {

    public List<SubscriptionInfo> getFilteredSubscriptionInfo() {

        List<SubscriptionInfo> subscriptions = getSubscriptionInfo(false);

        if (subscriptions.size() == 2) {

            SubscriptionInfo info1 = subscriptions.get(0);

packages/SystemUI/src/com/android/systemui/qs/tiles/dialog/InternetDialogController.java

+1 −1
Original line number Diff line number Diff line
@@ -197,7 +197,7 @@ public class InternetDialogController implements AccessPointController.AccessPoi 
            };



    protected List<SubscriptionInfo> getSubscriptionInfo() {

        return mKeyguardUpdateMonitor.getFilteredSubscriptionInfo(false);

        return mKeyguardUpdateMonitor.getFilteredSubscriptionInfo();

    }



    @Inject

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

+1 −1
Original line number Diff line number Diff line
@@ -107,7 +107,7 @@ public class EmergencyCryptkeeperText extends TextView { 
        boolean allSimsMissing = true;

        CharSequence displayText = null;



        List<SubscriptionInfo> subs = mKeyguardUpdateMonitor.getFilteredSubscriptionInfo(false);

        List<SubscriptionInfo> subs = mKeyguardUpdateMonitor.getFilteredSubscriptionInfo();

        final int N = subs.size();

        for (int i = 0; i < N; i++) {

            int subId = subs.get(i).getSubscriptionId();

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

+13 −14
Original line number Diff line number Diff line
@@ -29,7 +29,6 @@ import static junit.framework.TestCase.assertFalse; 
import static org.junit.Assert.assertEquals;

import static org.junit.Assert.assertNotEquals;

import static org.mockito.ArgumentMatchers.any;

import static org.mockito.ArgumentMatchers.anyBoolean;

import static org.mockito.ArgumentMatchers.anyInt;

import static org.mockito.Mockito.doAnswer;

import static org.mockito.Mockito.mock;
@@ -171,7 +170,7 @@ public class CarrierTextManagerTest extends SysuiTestCase { 
        reset(mCarrierTextCallback);

        List<SubscriptionInfo> list = new ArrayList<>();

        list.add(TEST_SUBSCRIPTION);

        when(mKeyguardUpdateMonitor.getFilteredSubscriptionInfo(anyBoolean())).thenReturn(list);

        when(mKeyguardUpdateMonitor.getFilteredSubscriptionInfo()).thenReturn(list);

        when(mKeyguardUpdateMonitor.getSimState(0)).thenReturn(TelephonyManager.SIM_STATE_READY);

        mKeyguardUpdateMonitor.mServiceStates = new HashMap<>();
@@ -191,7 +190,7 @@ public class CarrierTextManagerTest extends SysuiTestCase { 
        reset(mCarrierTextCallback);

        List<SubscriptionInfo> list = new ArrayList<>();

        list.add(TEST_SUBSCRIPTION);

        when(mKeyguardUpdateMonitor.getFilteredSubscriptionInfo(anyBoolean())).thenReturn(list);

        when(mKeyguardUpdateMonitor.getFilteredSubscriptionInfo()).thenReturn(list);

        when(mKeyguardUpdateMonitor.getSimState(0)).thenReturn(TelephonyManager.SIM_STATE_READY);

        when(mKeyguardUpdateMonitor.getSimState(1)).thenReturn(

                TelephonyManager.SIM_STATE_CARD_IO_ERROR);
@@ -224,7 +223,7 @@ public class CarrierTextManagerTest extends SysuiTestCase { 
    @Test

    public void testWrongSlots() {

        reset(mCarrierTextCallback);

        when(mKeyguardUpdateMonitor.getFilteredSubscriptionInfo(anyBoolean())).thenReturn(

        when(mKeyguardUpdateMonitor.getFilteredSubscriptionInfo()).thenReturn(

                new ArrayList<>());

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

                TelephonyManager.SIM_STATE_CARD_IO_ERROR);
@@ -238,7 +237,7 @@ public class CarrierTextManagerTest extends SysuiTestCase { 
    @Test

    public void testMoreSlotsThanSubs() {

        reset(mCarrierTextCallback);

        when(mKeyguardUpdateMonitor.getFilteredSubscriptionInfo(anyBoolean())).thenReturn(

        when(mKeyguardUpdateMonitor.getFilteredSubscriptionInfo()).thenReturn(

                new ArrayList<>());



        // STOPSHIP(b/130246708) This line makes sure that SubscriptionManager provides the
@@ -289,7 +288,7 @@ public class CarrierTextManagerTest extends SysuiTestCase { 
        list.add(TEST_SUBSCRIPTION);

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

                TelephonyManager.SIM_STATE_READY);

        when(mKeyguardUpdateMonitor.getFilteredSubscriptionInfo(anyBoolean())).thenReturn(list);

        when(mKeyguardUpdateMonitor.getFilteredSubscriptionInfo()).thenReturn(list);



        mKeyguardUpdateMonitor.mServiceStates = new HashMap<>();
@@ -314,7 +313,7 @@ public class CarrierTextManagerTest extends SysuiTestCase { 
        list.add(TEST_SUBSCRIPTION_ROAMING);

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

                TelephonyManager.SIM_STATE_READY);

        when(mKeyguardUpdateMonitor.getFilteredSubscriptionInfo(anyBoolean())).thenReturn(list);

        when(mKeyguardUpdateMonitor.getFilteredSubscriptionInfo()).thenReturn(list);



        mKeyguardUpdateMonitor.mServiceStates = new HashMap<>();
@@ -339,7 +338,7 @@ public class CarrierTextManagerTest extends SysuiTestCase { 
        list.add(TEST_SUBSCRIPTION_NULL);

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

                TelephonyManager.SIM_STATE_READY);

        when(mKeyguardUpdateMonitor.getFilteredSubscriptionInfo(anyBoolean())).thenReturn(list);

        when(mKeyguardUpdateMonitor.getFilteredSubscriptionInfo()).thenReturn(list);



        mKeyguardUpdateMonitor.mServiceStates = new HashMap<>();
@@ -364,7 +363,7 @@ public class CarrierTextManagerTest extends SysuiTestCase { 
        list.add(TEST_SUBSCRIPTION_NULL);

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

                TelephonyManager.SIM_STATE_READY);

        when(mKeyguardUpdateMonitor.getFilteredSubscriptionInfo(anyBoolean())).thenReturn(list);

        when(mKeyguardUpdateMonitor.getFilteredSubscriptionInfo()).thenReturn(list);

        mockWifi();



        mKeyguardUpdateMonitor.mServiceStates = new HashMap<>();
@@ -396,7 +395,7 @@ public class CarrierTextManagerTest extends SysuiTestCase { 
    @Test

    public void testCreateInfo_noSubscriptions() {

        reset(mCarrierTextCallback);

        when(mKeyguardUpdateMonitor.getFilteredSubscriptionInfo(anyBoolean())).thenReturn(

        when(mKeyguardUpdateMonitor.getFilteredSubscriptionInfo()).thenReturn(

                new ArrayList<>());



        ArgumentCaptor<CarrierTextManager.CarrierTextCallbackInfo> captor =
@@ -421,7 +420,7 @@ public class CarrierTextManagerTest extends SysuiTestCase { 
        list.add(TEST_SUBSCRIPTION);

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

                TelephonyManager.SIM_STATE_READY);

        when(mKeyguardUpdateMonitor.getFilteredSubscriptionInfo(anyBoolean())).thenReturn(list);

        when(mKeyguardUpdateMonitor.getFilteredSubscriptionInfo()).thenReturn(list);



        mKeyguardUpdateMonitor.mServiceStates = new HashMap<>();
@@ -446,7 +445,7 @@ public class CarrierTextManagerTest extends SysuiTestCase { 
        when(mKeyguardUpdateMonitor.getSimState(anyInt()))

                .thenReturn(TelephonyManager.SIM_STATE_READY)

                .thenReturn(TelephonyManager.SIM_STATE_NOT_READY);

        when(mKeyguardUpdateMonitor.getFilteredSubscriptionInfo(anyBoolean())).thenReturn(list);

        when(mKeyguardUpdateMonitor.getFilteredSubscriptionInfo()).thenReturn(list);



        mKeyguardUpdateMonitor.mServiceStates = new HashMap<>();
@@ -471,7 +470,7 @@ public class CarrierTextManagerTest extends SysuiTestCase { 
        when(mKeyguardUpdateMonitor.getSimState(anyInt()))

                .thenReturn(TelephonyManager.SIM_STATE_NOT_READY)

                .thenReturn(TelephonyManager.SIM_STATE_READY);

        when(mKeyguardUpdateMonitor.getFilteredSubscriptionInfo(anyBoolean())).thenReturn(list);

        when(mKeyguardUpdateMonitor.getFilteredSubscriptionInfo()).thenReturn(list);



        mKeyguardUpdateMonitor.mServiceStates = new HashMap<>();
@@ -498,7 +497,7 @@ public class CarrierTextManagerTest extends SysuiTestCase { 
                .thenReturn(TelephonyManager.SIM_STATE_READY)

                .thenReturn(TelephonyManager.SIM_STATE_NOT_READY)

                .thenReturn(TelephonyManager.SIM_STATE_READY);

        when(mKeyguardUpdateMonitor.getFilteredSubscriptionInfo(anyBoolean())).thenReturn(list);

        when(mKeyguardUpdateMonitor.getFilteredSubscriptionInfo()).thenReturn(list);

        mKeyguardUpdateMonitor.mServiceStates = new HashMap<>();



        ArgumentCaptor<CarrierTextManager.CarrierTextCallbackInfo> captor =