Merge \\\"Fix infinite loop when registering data usage callback.\\\" into nyc-dev am: 55e82ab60f am: 13cf0e7d54

am: 1d4fd3ed27 Change-Id: I5140373d930726e0b93fa62ac03315a37c581b5b
2016-06-20 22:44:51 +00:00
parent 451f9f1b2c 55e82ab60f
commit 02f3b13b51
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 */);
    }

    /**