Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
TreeHugger Robot
2022-10-12 11:12:00 +00:00
committed by Android (Google) Code Review
parent 9a6046ab0b 2ff209779f
commit 29835fbf14
6 changed files with 18 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/SystemUI/src/com/android/keyguard/CarrierTextManager.java
View File

@@ -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() {

2
packages/SystemUI/src/com/android/keyguard/KeyguardUpdateMonitor.java
View File

@@ -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 * 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);

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

@@ -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

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

@@ -107,7 +107,7 @@ public class EmergencyCryptkeeperText extends TextView {
boolean allSimsMissing = true; boolean allSimsMissing = true;
CharSequence displayText = null; CharSequence displayText = null;
List<SubscriptionInfo> subs = mKeyguardUpdateMonitor.getFilteredSubscriptionInfo(false); List<SubscriptionInfo> subs = mKeyguardUpdateMonitor.getFilteredSubscriptionInfo();
final int N = subs.size(); final int N = subs.size();
for (int i = 0; i < N; i++) { for (int i = 0; i < N; i++) {
int subId = subs.get(i).getSubscriptionId(); int subId = subs.get(i).getSubscriptionId();

27
packages/SystemUI/tests/src/com/android/keyguard/CarrierTextManagerTest.java
View File

@@ -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 =

2
packages/SystemUI/tests/src/com/android/keyguard/KeyguardUpdateMonitorTest.java
View File

@@ -905,7 +905,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);
} }