Merge "Fix LingerMonitor notification rate limiting" am: 822d2b5991 am: 65cf30800c

am: eb7dedc3b8 Change-Id: I1cdc817a27b7e966837d9c56f7e93b8bc917c6c0
2018-11-13 02:12:51 -08:00
parent 7ce46d8ec9 eb7dedc3b8
commit 49f792a689
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() {