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

Merge "[Telephony Mainline] Rename getActiveAndHiddenSubscriptionIdList and guard with permission" am: c80aabbd2e

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1260749

Change-Id: I43a19b479d4c77bb19af31381e7d998527bc068a
This commit is contained in:
Peter Wang
2020-07-31 09:04:43 +00:00
committed by Automerger Merge Worker
parent 64573a945a c80aabbd2e
commit 1cd92f18b3
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

@@ -130,7 +130,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();
} }
@@ -139,7 +139,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();
} }