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

Commit 0b4e1b80 authored by Chandru's avatar Chandru Committed by Chandru S
Browse files

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

Bug: 249467771
Test: atest KeyguardUpdateMonitorTest
Test: atest CarrierTextManagerTest
Change-Id: Ia59a1723e8462c43ee53e66a9932eb6a451ef5ca
parent 38be8a6d

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

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

    }





    protected List<SubscriptionInfo> getSubscriptionInfo() {

    protected List<SubscriptionInfo> getSubscriptionInfo() {

        return mKeyguardUpdateMonitor.getFilteredSubscriptionInfo(false);

        return mKeyguardUpdateMonitor.getFilteredSubscriptionInfo();

    }

    }





    protected void updateCarrierText() {

    protected void updateCarrierText() {

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

+1 −1
Original line number Original line Diff line number Diff line
@@ -598,7 +598,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

     * 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.

     * on the status bar and quick settings.

     */

     */

    public List<SubscriptionInfo> getFilteredSubscriptionInfo(boolean forceReload) {

    public List<SubscriptionInfo> getFilteredSubscriptionInfo() {

        List<SubscriptionInfo> subscriptions = getSubscriptionInfo(false);

        List<SubscriptionInfo> subscriptions = getSubscriptionInfo(false);

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

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

            SubscriptionInfo info1 = subscriptions.get(0);

            SubscriptionInfo info1 = subscriptions.get(0);

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

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

            };





    protected List<SubscriptionInfo> getSubscriptionInfo() {

    protected List<SubscriptionInfo> getSubscriptionInfo() {

        return mKeyguardUpdateMonitor.getFilteredSubscriptionInfo(false);

        return mKeyguardUpdateMonitor.getFilteredSubscriptionInfo();

    }

    }





    @Inject

    @Inject

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

+13 −14
Original line number Original line 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.assertEquals;

import static org.junit.Assert.assertNotEquals;

import static org.junit.Assert.assertNotEquals;

import static org.mockito.ArgumentMatchers.any;

import static org.mockito.ArgumentMatchers.any;

import static org.mockito.ArgumentMatchers.anyBoolean;

import static org.mockito.ArgumentMatchers.anyInt;

import static org.mockito.ArgumentMatchers.anyInt;

import static org.mockito.Mockito.doAnswer;

import static org.mockito.Mockito.doAnswer;

import static org.mockito.Mockito.mock;

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

        reset(mCarrierTextCallback);

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

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

        list.add(TEST_SUBSCRIPTION);

        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(0)).thenReturn(TelephonyManager.SIM_STATE_READY);

        mKeyguardUpdateMonitor.mServiceStates = new HashMap<>();

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

        reset(mCarrierTextCallback);

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

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

        list.add(TEST_SUBSCRIPTION);

        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(0)).thenReturn(TelephonyManager.SIM_STATE_READY);

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

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

                TelephonyManager.SIM_STATE_CARD_IO_ERROR);

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

    @Test

    public void testWrongSlots() {

    public void testWrongSlots() {

        reset(mCarrierTextCallback);

        reset(mCarrierTextCallback);

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

        when(mKeyguardUpdateMonitor.getFilteredSubscriptionInfo()).thenReturn(

                new ArrayList<>());

                new ArrayList<>());

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

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

                TelephonyManager.SIM_STATE_CARD_IO_ERROR);

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

    @Test

    public void testMoreSlotsThanSubs() {

    public void testMoreSlotsThanSubs() {

        reset(mCarrierTextCallback);

        reset(mCarrierTextCallback);

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

        when(mKeyguardUpdateMonitor.getFilteredSubscriptionInfo()).thenReturn(

                new ArrayList<>());

                new ArrayList<>());





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

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

        list.add(TEST_SUBSCRIPTION);

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

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

                TelephonyManager.SIM_STATE_READY);

                TelephonyManager.SIM_STATE_READY);

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

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





        mKeyguardUpdateMonitor.mServiceStates = new HashMap<>();

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

        list.add(TEST_SUBSCRIPTION_ROAMING);

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

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

                TelephonyManager.SIM_STATE_READY);

                TelephonyManager.SIM_STATE_READY);

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

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





        mKeyguardUpdateMonitor.mServiceStates = new HashMap<>();

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

        list.add(TEST_SUBSCRIPTION_NULL);

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

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

                TelephonyManager.SIM_STATE_READY);

                TelephonyManager.SIM_STATE_READY);

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

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





        mKeyguardUpdateMonitor.mServiceStates = new HashMap<>();

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

        list.add(TEST_SUBSCRIPTION_NULL);

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

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

                TelephonyManager.SIM_STATE_READY);

                TelephonyManager.SIM_STATE_READY);

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

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

        mockWifi();

        mockWifi();





        mKeyguardUpdateMonitor.mServiceStates = new HashMap<>();

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

    @Test

    public void testCreateInfo_noSubscriptions() {

    public void testCreateInfo_noSubscriptions() {

        reset(mCarrierTextCallback);

        reset(mCarrierTextCallback);

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

        when(mKeyguardUpdateMonitor.getFilteredSubscriptionInfo()).thenReturn(

                new ArrayList<>());

                new ArrayList<>());





        ArgumentCaptor<CarrierTextManager.CarrierTextCallbackInfo> captor =

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

        list.add(TEST_SUBSCRIPTION);

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

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

                TelephonyManager.SIM_STATE_READY);

                TelephonyManager.SIM_STATE_READY);

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

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





        mKeyguardUpdateMonitor.mServiceStates = new HashMap<>();

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

        when(mKeyguardUpdateMonitor.getSimState(anyInt()))

                .thenReturn(TelephonyManager.SIM_STATE_READY)

                .thenReturn(TelephonyManager.SIM_STATE_READY)

                .thenReturn(TelephonyManager.SIM_STATE_NOT_READY);

                .thenReturn(TelephonyManager.SIM_STATE_NOT_READY);

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

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





        mKeyguardUpdateMonitor.mServiceStates = new HashMap<>();

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

        when(mKeyguardUpdateMonitor.getSimState(anyInt()))

                .thenReturn(TelephonyManager.SIM_STATE_NOT_READY)

                .thenReturn(TelephonyManager.SIM_STATE_NOT_READY)

                .thenReturn(TelephonyManager.SIM_STATE_READY);

                .thenReturn(TelephonyManager.SIM_STATE_READY);

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

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





        mKeyguardUpdateMonitor.mServiceStates = new HashMap<>();

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

                .thenReturn(TelephonyManager.SIM_STATE_READY)

                .thenReturn(TelephonyManager.SIM_STATE_NOT_READY)

                .thenReturn(TelephonyManager.SIM_STATE_NOT_READY)

                .thenReturn(TelephonyManager.SIM_STATE_READY);

                .thenReturn(TelephonyManager.SIM_STATE_READY);

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

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

        mKeyguardUpdateMonitor.mServiceStates = new HashMap<>();

        mKeyguardUpdateMonitor.mServiceStates = new HashMap<>();





        ArgumentCaptor<CarrierTextManager.CarrierTextCallbackInfo> captor =

        ArgumentCaptor<CarrierTextManager.CarrierTextCallbackInfo> captor =

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

+1 −1
Original line number Original line Diff line number Diff line
@@ -913,7 +913,7 @@ public class KeyguardUpdateMonitorTest extends SysuiTestCase { 
        mTestableLooper.processAllMessages();

        mTestableLooper.processAllMessages();





        List<SubscriptionInfo> listToVerify = mKeyguardUpdateMonitor

        List<SubscriptionInfo> listToVerify = mKeyguardUpdateMonitor

                .getFilteredSubscriptionInfo(false);

                .getFilteredSubscriptionInfo();

        assertThat(listToVerify.size()).isEqualTo(1);

        assertThat(listToVerify.size()).isEqualTo(1);

        assertThat(listToVerify.get(0)).isEqualTo(TEST_SUBSCRIPTION_2);

        assertThat(listToVerify.get(0)).isEqualTo(TEST_SUBSCRIPTION_2);

    }

    }