commit 171598cb7c77068dc919146e0ce266f0bdb62d58
author Peter Wang <tpwang@google.com> Mon Mar 16 04:45:23 2020 -0700
committer Peter Wang <tpwang@google.com> Thu Jul 16 02:01:06 2020 -0700
tree 85c6ae154ca709fe043348407606d5b6918b3c7e
parent 491d1837e966e904cae66a24b56fd4c35e2c0a7d

[Telephony Mainline] Rename getActiveAndHiddenSubscriptionIdList and
guard with permission

Bug: 150878235
Fix: 150878235
Test: Build
Change-Id: I7f3b1f5170e032336d9b39b322c49e2b92573586
Merged-In: I7f3b1f5170e032336d9b39b322c49e2b92573586

services/core/java/com/android/server/net/NetworkStatsSubscriptionsMonitor.java

diff --git a/services/core/java/com/android/server/net/NetworkStatsSubscriptionsMonitor.java b/services/core/java/com/android/server/net/NetworkStatsSubscriptionsMonitor.java
index 7711c6a..db553ee 100644
--- a/services/core/java/com/android/server/net/NetworkStatsSubscriptionsMonitor.java
+++ b/services/core/java/com/android/server/net/NetworkStatsSubscriptionsMonitor.java
@@ -125,7 +125,7 @@
     @NonNull
     private List<Integer> getActiveSubIdList(@NonNull SubscriptionManager subscriptionManager) {
         final ArrayList<Integer> ret = new ArrayList<>();
-        final int[] ids = subscriptionManager.getActiveAndHiddenSubscriptionIdList();
+        final int[] ids = subscriptionManager.getCompleteActiveSubscriptionIdList();
         for (int id : ids) ret.add(id);
         return ret;
     }