LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[Telephony Mainline] Rename getActiveAndHiddenSubscriptionIdList and

Browse Source 
guard with permission

Bug: 150878235
Fix: 150878235
Test: Build
Change-Id: I7f3b1f5170e032336d9b39b322c49e2b92573586
Merged-In: I7f3b1f5170e032336d9b39b322c49e2b92573586
This commit is contained in:
Peter Wang
2020-03-16 04:45:23 -07:00
parent 43b3142dc3
commit 1041764067
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
tests/net/java/com/android/server/net/NetworkStatsSubscriptionsMonitorTest.java
View File

@@ -128,7 +128,7 @@ public final class NetworkStatsSubscriptionsMonitorTest {
mTestSubList.add(subId); mTestSubList.add(subId);
final int[] subList = convertArrayListToIntArray(mTestSubList); final int[] subList = convertArrayListToIntArray(mTestSubList);
when(mSubscriptionManager.getActiveAndHiddenSubscriptionIdList()).thenReturn(subList); when(mSubscriptionManager.getCompleteActiveSubscriptionIdList()).thenReturn(subList);
when(mTelephonyManager.getSubscriberId(subId)).thenReturn(subscriberId); when(mTelephonyManager.getSubscriberId(subId)).thenReturn(subscriberId);
mMonitor.onSubscriptionsChanged(); mMonitor.onSubscriptionsChanged();
} }
@@ -137,7 +137,7 @@ public final class NetworkStatsSubscriptionsMonitorTest {
// Remove subId from TestSubList. // Remove subId from TestSubList.
mTestSubList.removeIf(it -> it == subId); mTestSubList.removeIf(it -> it == subId);
final int[] subList = convertArrayListToIntArray(mTestSubList); final int[] subList = convertArrayListToIntArray(mTestSubList);
when(mSubscriptionManager.getActiveAndHiddenSubscriptionIdList()).thenReturn(subList); when(mSubscriptionManager.getCompleteActiveSubscriptionIdList()).thenReturn(subList);
mMonitor.onSubscriptionsChanged(); mMonitor.onSubscriptionsChanged();
} }