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

The provider model slice carrier toggle is broke.

Browse Source 
The slice doesn't upload subId for TelephonyManager and
the listeners.

Bug: 177385874
Test: (PASS)atest NetworkProviderWorkerTest
(PASS)atest ProviderModelSliceTest
(PASS)atest ProviderModelSliceHelperTest

Change-Id: Icc8a7793204de2e2eadd0454edf50e466821b8f9
This commit is contained in:
SongFerngWang
2021-01-13 22:11:49 +08:00
parent 88ffca9af9
commit f3b25cc7cb
5 changed files with 57 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
tests/unit/src/com/android/settings/network/ProviderModelSliceTest.java
View File

@@ -178,7 +178,7 @@ public class ProviderModelSliceTest {
public void getSlice_noWifiAndHasCarrierNoData_oneCarrierOneGridRowWithAllNetworkUnavailable() {
mWifiList.clear();
mMockNetworkProviderWorker.updateSelfResults(null);
mockHelperCondition(false, true, true, null);
mockHelperCondition(false, true, false, null);
final Slice slice = mMockProviderModelSlice.getSlice();
@@ -192,7 +192,7 @@ public class ProviderModelSliceTest {
public void getSlice_noWifiAndNoCarrier_oneCarrierOneGridRowWithNonCarrierNetworkUnavailable() {
mWifiList.clear();
mMockProviderModelSlice = new MockProviderModelSlice(mContext, null);
mockHelperCondition(false, true, false, null);
mockHelperCondition(false, true, true, null);
final Slice slice = mMockProviderModelSlice.getSlice();
@@ -212,7 +212,7 @@ public class ProviderModelSliceTest {
WifiEntry.CONNECTED_STATE_DISCONNECTED, "wifi2_key", true);
mWifiList.add(mMockWifiSliceItem2);
mMockNetworkProviderWorker.updateSelfResults(mWifiList);
mockHelperCondition(false, true, false, mWifiList.get(0));
mockHelperCondition(false, true, true, mWifiList.get(0));
final Slice slice = mMockProviderModelSlice.getSlice();
@@ -268,10 +268,10 @@ public class ProviderModelSliceTest {
}
private void mockHelperCondition(boolean airplaneMode, boolean hasCarrier,
boolean isNoCarrierData, WifiSliceItem connectedWifiItem) {
boolean isDataSimActive, WifiSliceItem connectedWifiItem) {
when(mProviderModelSliceHelper.isAirplaneModeEnabled()).thenReturn(airplaneMode);
when(mProviderModelSliceHelper.hasCarrier()).thenReturn(hasCarrier);
when(mProviderModelSliceHelper.isNoCarrierData()).thenReturn(isNoCarrierData);
when(mProviderModelSliceHelper.isDataSimActive()).thenReturn(isDataSimActive);
when(mProviderModelSliceHelper.getConnectedWifiItem(any())).thenReturn(connectedWifiItem);
}

24
tests/unit/src/com/android/settings/network/telephony/NetworkProviderWorkerTest.java
View File

@@ -69,7 +69,6 @@ public class NetworkProviderWorkerTest {
MockitoAnnotations.initMocks(this);
mContext = spy(ApplicationProvider.getApplicationContext());
when(mContext.getSystemService(SubscriptionManager.class)).thenReturn(mSubscriptionManager);
when(mContext.getSystemService(ConnectivityManager.class)).thenReturn(mConnectivityManager);
when(mContext.getSystemService(TelephonyManager.class)).thenReturn(mTelephonyManager);
when(mTelephonyManager.createForSubscriptionId(anyInt())).thenReturn(mTelephonyManager);
@@ -141,6 +140,7 @@ public class NetworkProviderWorkerTest {
public void onSubscriptionsChanged_notifySubscriptionChanged_callUpdateSlice() {
mMockNetworkProviderWorker.onSlicePinned();
mMockNetworkProviderWorker.receiveNotification(false);
mMockNetworkProviderWorker.setDefaultDataSubscriptionId(2);
mMockNetworkProviderWorker.onSubscriptionsChanged();
@@ -213,17 +213,6 @@ public class NetworkProviderWorkerTest {
assertThat(mMockNetworkProviderWorker.hasNotification()).isTrue();
}
@Test
@UiThreadTest
public void onActiveDataSubscriptionIdChanged_notifyPhoneStateListener_callUpdateSlice() {
mMockNetworkProviderWorker.onSlicePinned();
mMockNetworkProviderWorker.receiveNotification(false);
mMockNetworkProviderWorker.mPhoneStateListener.onActiveDataSubscriptionIdChanged(1);
assertThat(mMockNetworkProviderWorker.hasNotification()).isTrue();
}
@Test
@UiThreadTest
public void onDisplayInfoChanged_notifyPhoneStateListener_callUpdateSlice() {
@@ -238,7 +227,7 @@ public class NetworkProviderWorkerTest {
public class MockNetworkProviderWorker extends NetworkProviderWorker {
private boolean mHasNotification = false;
private int mDefaultDataSubId = 1;
MockNetworkProviderWorker(Context context, Uri uri) {
super(context, uri);
}
@@ -260,5 +249,14 @@ public class NetworkProviderWorkerTest {
public void setWifiPickerTracker(WifiPickerTracker wifiPickerTracker) {
mWifiPickerTracker = wifiPickerTracker;
}
@Override
public int getDefaultDataSubscriptionId() {
return mDefaultDataSubId;
}
public void setDefaultDataSubscriptionId(int defaultDataSubId) {
mDefaultDataSubId = defaultDataSubId;
}
}
}