Merge "Fix LingerMonitor notification rate limiting" am: 506c6bd17e

am: 160e47e6e1 Change-Id: I17b180a7dc2d06c54d4a6282414b818b83ecdfdc
2018-11-13 01:59:56 -08:00
parent 5519795666 160e47e6e1
commit 55ae6b7593
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() {