commit 8bab3c398409e952e8847b069eede45e5c7cde3c
author Aaron Huang <huangaaron@google.com> Fri Jun 12 02:11:31 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Jun 12 02:11:31 2020 +0000
tree 01bf84baf62c905611dc79f30f3cc88cc8a5c51f
parent d33c2715155c3f9a6c36d76afd5426e7cff55963
parent da12e7f732e51e01dc4d9450db70a6fe443f400b

Merge "Add unit test for NetworkStatsSubscriptionsMonitor" into rvc-dev am: 32f8a56636

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11788484

Change-Id: I147966b0b3480b44fa89aafd652ecfef8d68339b

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;
+        }
     }
 }