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

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

Change-Id: I7c557b81d3e5ac35b7e8559d8f5d4f5e0d29236a
This commit is contained in:
Aaron Huang
2020-06-12 02:19:55 +00:00
committed by Automerger Merge Worker

View File

@@ -28,6 +28,7 @@ import android.telephony.TelephonyManager;
import android.text.TextUtils; import android.text.TextUtils;
import android.util.Log; import android.util.Log;
import com.android.internal.annotations.VisibleForTesting;
import com.android.internal.util.CollectionUtils; import com.android.internal.util.CollectionUtils;
import java.util.ArrayList; import java.util.ArrayList;
@@ -38,8 +39,6 @@ import java.util.concurrent.Executor;
/** /**
* Helper class that watches for events that are triggered per subscription. * 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 public class NetworkStatsSubscriptionsMonitor extends
SubscriptionManager.OnSubscriptionsChangedListener { SubscriptionManager.OnSubscriptionsChangedListener {
@@ -207,5 +206,10 @@ public class NetworkStatsSubscriptionsMonitor extends
mLastCollapsedRatType = collapsedRatType; mLastCollapsedRatType = collapsedRatType;
mMonitor.mDelegate.onCollapsedRatTypeChanged(mSubscriberId, mLastCollapsedRatType); mMonitor.mDelegate.onCollapsedRatTypeChanged(mSubscriberId, mLastCollapsedRatType);
} }
@VisibleForTesting
public int getSubId() {
return mSubId;
}
} }
} }