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

am: 13cf0e7d54 Change-Id: Idb7a28cf53e4c1b963df2dc0aff8de47d9ca8069
2016-06-20 22:36:49 +00:00
parent 87ee785316 13cf0e7d54
commit 1d4fd3ed27
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 */);
    }

    /**