Merge \"Fix infinite loop when registering data usage callback.\" into nyc-dev

am: c20ffc2a9e Change-Id: I477910de04ef5a9a35d795240b93c3cf56e78042
2016-06-20 22:29:49 +00:00
parent 61923ced0c c20ffc2a9e
commit 13cf0e7d54
1 changed files with 2 additions and 1 deletions
--- a/core/java/android/app/usage/NetworkStatsManager.java
+++ b/core/java/android/app/usage/NetworkStatsManager.java
@@ -305,7 +305,8 @@ public class NetworkStatsManager {
     */
    public void registerUsageCallback(int networkType, String subscriberId, long thresholdBytes,
            UsageCallback callback) {
-        registerUsageCallback(networkType, subscriberId, thresholdBytes, null /* handler */);
+        registerUsageCallback(networkType, subscriberId, thresholdBytes, callback,
+                null /* handler */);
    }

    /**