Merge "Fix LingerMonitor notification rate limiting"

am: 822d2b5991 Change-Id: I68800c06e8d4413b2e46176a12dc60b436277653
2018-11-13 01:46:21 -08:00 · 2018-11-13 01:46:21 -08:00 · 65cf30800c
commit 65cf30800c
parent 57b23ac131 822d2b5991
1 changed files with 2 additions and 0 deletions
--- a/services/core/java/com/android/server/connectivity/LingerMonitor.java
+++ b/services/core/java/com/android/server/connectivity/LingerMonitor.java
@ -90,6 +90,8 @@ public class LingerMonitor {
        mNotifier = notifier;
        mDailyLimit = dailyLimit;
        mRateLimitMillis = rateLimitMillis;
+        // Ensure that (now - mFirstNotificationMillis) >= rateLimitMillis at first
+        mFirstNotificationMillis = -rateLimitMillis;
    }

    private static HashMap<String, Integer> makeTransportToNameMap() {