[Mainline] Use public method in SubscriptionManager for mainline
- getActiveSubscriptionIdList To use getActiveSubscriptionInfoList to get subscription Id list - getActiveSubscriptionInfoList(Z) To use getActiveSubscriptionInfoList() instead Bug: 144478274 Test: make RunSettingsRoboTests ROBOTEST_FILTER=SimLockPreferenceControllerTest make RunSettingsRoboTests ROBOTEST_FILTER=MobileNetworkUtilsTest make RunSettingsRoboTests ROBOTEST_FILTER=TelephonyBasePreferenceControllerTest Change-Id: I4d6113561906af5c9e4ac7737aefac17c926059a
This commit is contained in:
@@ -21,7 +21,6 @@ import static android.telephony.TelephonyManager.SIM_STATE_READY;
|
||||
import static com.google.common.truth.Truth.assertThat;
|
||||
|
||||
import static org.mockito.ArgumentMatchers.anyInt;
|
||||
import static org.mockito.ArgumentMatchers.eq;
|
||||
import static org.mockito.Mockito.mock;
|
||||
import static org.mockito.Mockito.when;
|
||||
|
||||
@@ -143,7 +142,7 @@ public class SimLockPreferenceControllerTest {
|
||||
subscriptionInfoList.add(info);
|
||||
when(mTelephonyManager.createForSubscriptionId(anyInt())).thenReturn(mTelephonyManager);
|
||||
when(mTelephonyManager.hasIccCard()).thenReturn(true);
|
||||
when(mSubscriptionManager.getActiveSubscriptionInfoList(eq(true)))
|
||||
when(mSubscriptionManager.getActiveSubscriptionInfoList())
|
||||
.thenReturn(subscriptionInfoList);
|
||||
}
|
||||
|
||||
@@ -152,7 +151,7 @@ public class SimLockPreferenceControllerTest {
|
||||
SubscriptionInfo info = mock(SubscriptionInfo.class);
|
||||
subscriptionInfoList.add(info);
|
||||
when(mTelephonyManager.getSimState(anyInt())).thenReturn(SIM_STATE_READY);
|
||||
when(mSubscriptionManager.getActiveSubscriptionInfoList(eq(true)))
|
||||
when(mSubscriptionManager.getActiveSubscriptionInfoList())
|
||||
.thenReturn(subscriptionInfoList);
|
||||
}
|
||||
}
|
||||
|
Reference in New Issue
Block a user