commit 3e045d41e145ea1f022afa76eab24c86b14e6f84
author Michael Groover <mpgroover@google.com> Mon Jun 22 19:30:10 2020 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Jun 22 19:30:10 2020 +0000
tree 39a17f697130785343e0f57a910cd2f2c5916a00
parent da12e7f732e51e01dc4d9450db70a6fe443f400b
parent 3dae8b1b41c2cee6ee9ebb369442d115aeb5921f

Merge "Update docs for methods that require subscriberId" into rvc-dev

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 0bdf3f2..a0ab5ea 100644
--- a/services/core/java/com/android/server/net/NetworkStatsSubscriptionsMonitor.java
+++ b/services/core/java/com/android/server/net/NetworkStatsSubscriptionsMonitor.java
@@ -28,6 +28,7 @@
 import android.text.TextUtils;
 import android.util.Log;
 
+import com.android.internal.annotations.VisibleForTesting;
 import com.android.internal.util.CollectionUtils;
 
 import java.util.ArrayList;
@@ -38,8 +39,6 @@
 /**
  * Helper class that watches for events that are triggered per subscription.
  */
-// TODO (b/152176562): Write tests to verify subscription changes generate corresponding
-//  register/unregister calls.
 public class NetworkStatsSubscriptionsMonitor extends
         SubscriptionManager.OnSubscriptionsChangedListener {
 
@@ -207,5 +206,10 @@
             mLastCollapsedRatType = collapsedRatType;
             mMonitor.mDelegate.onCollapsedRatTypeChanged(mSubscriberId, mLastCollapsedRatType);
         }
+
+        @VisibleForTesting
+        public int getSubId() {
+            return mSubId;
+        }
     }
 }