From 379975d9e7d9538f2078973daa5a319d774265f1 Mon Sep 17 00:00:00 2001 From: Tim Murray Date: Fri, 11 Nov 2022 12:29:40 -0800 Subject: [PATCH] Revert "Revert "BroadcastQueue: more increasing delay knobs."" Delay works (as far as we can tell) once persistent apps are exempted. Test: atest FrameworksMockingServicesTests:BroadcastRecordTest Test: atest FrameworksMockingServicesTests:BroadcastQueueTest Test: atest FrameworksMockingServicesTests:BroadcastQueueModernImplTest Test: atest CtsWifiTestCases:android.net.wifi.cts.ConcurrencyTest#testRequestNetworkInfo Bug: 258718309 Change-Id: I21e240edaca601de327e15db726af73b210607eb --- .../core/java/com/android/server/am/BroadcastConstants.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/services/core/java/com/android/server/am/BroadcastConstants.java b/services/core/java/com/android/server/am/BroadcastConstants.java index 56909e35bbe30..dfac82cbe91b8 100644 --- a/services/core/java/com/android/server/am/BroadcastConstants.java +++ b/services/core/java/com/android/server/am/BroadcastConstants.java @@ -170,7 +170,7 @@ public class BroadcastConstants { */ public long DELAY_NORMAL_MILLIS = DEFAULT_DELAY_NORMAL_MILLIS; private static final String KEY_DELAY_NORMAL_MILLIS = "bcast_delay_normal_millis"; - private static final long DEFAULT_DELAY_NORMAL_MILLIS = 0; + private static final long DEFAULT_DELAY_NORMAL_MILLIS = +500; /** * For {@link BroadcastQueueModernImpl}: Delay to apply to broadcasts @@ -178,7 +178,7 @@ public class BroadcastConstants { */ public long DELAY_CACHED_MILLIS = DEFAULT_DELAY_CACHED_MILLIS; private static final String KEY_DELAY_CACHED_MILLIS = "bcast_delay_cached_millis"; - private static final long DEFAULT_DELAY_CACHED_MILLIS = +30_000; + private static final long DEFAULT_DELAY_CACHED_MILLIS = +120_000; /** * For {@link BroadcastQueueModernImpl}: Delay to apply to urgent