PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix incorrect mapping to get subscriptioninfo

Browse Source 
getActiveSubscriptionInfoList() returns a list of active subscription.
It doesn't 1:1 mapping with slotId. So it is not correct to use slotId
as index to get subscriptioninfo from list.
Use framework interface getActiveSubscriptionInfoForSimSlotIndex() to
get subscriptioninfo per slotid instead.

Fixes: 129038597
Test: robotest
Change-Id: If4277c425e6145e0e3ba716551d0dce46cdb61ab
This commit is contained in:
Fan Zhang
2019-04-24 14:56:00 -07:00
parent 8c16ef2906
commit f61db6e9d7
2 changed files with 42 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
tests/robotests/src/com/android/settings/deviceinfo/imei/ImeiInfoDialogControllerTest.java
View File

@@ -28,12 +28,14 @@ import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.anyInt;
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.eq;
import static org.mockito.Mockito.never;
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
import android.content.Context;
import android.telephony.SubscriptionInfo;
import android.telephony.SubscriptionManager;
import android.telephony.TelephonyManager;
import org.junit.Before;
@@ -43,6 +45,9 @@ import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.robolectric.RobolectricTestRunner;
import org.robolectric.RuntimeEnvironment;
import org.robolectric.shadow.api.Shadow;
import org.robolectric.shadows.ShadowSubscriptionManager;
import org.robolectric.shadows.ShadowTelephonyManager;
import org.robolectric.util.ReflectionHelpers;
@RunWith(RobolectricTestRunner.class)
@@ -53,6 +58,8 @@ public class ImeiInfoDialogControllerTest {
private static final String IMEI_NUMBER = "2341982751254";
private static final String MIN_NUMBER = "123417851315";
private static final String IMEI_SV_NUMBER = "12";
private static final int SLOT_ID = 0;
private static final int SUB_ID = 0;
@Mock
private ImeiInfoDialogFragment mDialog;
@@ -68,10 +75,16 @@ public class ImeiInfoDialogControllerTest {
public void setup() {
MockitoAnnotations.initMocks(this);
mContext = spy(RuntimeEnvironment.application);
doReturn(mTelephonyManager).when(mContext).getSystemService(Context.TELEPHONY_SERVICE);
final ShadowSubscriptionManager ssm = Shadow.extract(mContext.getSystemService(
SubscriptionManager.class));
ssm.setActiveSubscriptionInfos(mSubscriptionInfo);
when(mSubscriptionInfo.getSubscriptionId()).thenReturn(SUB_ID);
final ShadowTelephonyManager stm = Shadow.extract(mContext.getSystemService(
TelephonyManager.class));
stm.setTelephonyManagerForSubscriptionId(SUB_ID, mTelephonyManager);
when(mDialog.getContext()).thenReturn(mContext);
mController = spy(new ImeiInfoDialogController(mDialog, 0 /* phone id */));
ReflectionHelpers.setField(mController, "mSubscriptionInfo", mSubscriptionInfo);
mController = spy(new ImeiInfoDialogController(mDialog, SLOT_ID));
doReturn(PRL_VERSION).when(mController).getCdmaPrlVersion();
doReturn(MEID_NUMBER).when(mController).getMeid();
@@ -80,6 +93,14 @@ public class ImeiInfoDialogControllerTest {
when(mTelephonyManager.getImei(anyInt())).thenReturn(IMEI_NUMBER);
}
@Test
public void populateImeiInfo_invalidSlot_shouldSetNothing() {
mController = spy(new ImeiInfoDialogController(mDialog, SLOT_ID + 1));
mController.populateImeiInfo();
verify(mDialog, never()).setText(anyInt(), any());
}
@Test
public void populateImeiInfo_cdmaLteEnabled_shouldSetMeidAndImeiAndMin() {
doReturn(true).when(mController).isCdmaLteEnabled();