Merge "Fix LingerMonitor notification rate limiting"

2018-11-13 09:36:39 +00:00
parent e666ae6ee5 1dd54da1f6
commit 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() {