commit b6ff6f6c2c94ecd4b48fe121be8302518b3d2e11
author Peter Wang <tpwang@google.com> Fri Jul 31 08:43:44 2020 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Jul 31 08:43:44 2020 +0000
tree 9c2d8e8fd703c206313d98135b954fdb849ded20
parent ae5caa00132f4fd2184dff7f19343375edd1afc8
parent 171598cb7c77068dc919146e0ce266f0bdb62d58

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

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 5f2c4a3..0575ac6 100644
--- a/services/core/java/com/android/server/net/NetworkStatsSubscriptionsMonitor.java
+++ b/services/core/java/com/android/server/net/NetworkStatsSubscriptionsMonitor.java
@@ -127,7 +127,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;
     }