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

2016-06-20 22:23:34 +00:00 · 2016-06-20 22:23:34 +00:00 · 55e82ab60f
commit 55e82ab60f
parent 5065b30601 320e313d2c
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 */);
    }

    /**