summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Suprabh Shukla <suprabh@google.com> 2021-03-31 08:11:59 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2021-03-31 08:11:59 +0000
commitfad1fea130c90437face8e4c93b0e366549dd69b (patch)
tree88cc59b80d15dcdffde59a1045ffb7ed3bb6839d
parent2935ef01dc21ee6da61ae52dd81fb42544bc6516 (diff)
parent98312aaa974b28db194d888ab39e9be86138e1db (diff)
Merge "Fail callers that use exact alarms without permission" into sc-dev
-rw-r--r--apex/jobscheduler/service/java/com/android/server/alarm/AlarmManagerService.java3
1 files changed, 1 insertions, 2 deletions
diff --git a/apex/jobscheduler/service/java/com/android/server/alarm/AlarmManagerService.java b/apex/jobscheduler/service/java/com/android/server/alarm/AlarmManagerService.java
index 3c9496f557a1..901daa73afb3 100644
--- a/apex/jobscheduler/service/java/com/android/server/alarm/AlarmManagerService.java
+++ b/apex/jobscheduler/service/java/com/android/server/alarm/AlarmManagerService.java
@@ -472,8 +472,7 @@ public class AlarmManagerService extends SystemService {
private static final long DEFAULT_ALLOW_WHILE_IDLE_WINDOW = 60 * 60 * 1000; // 1 hour.
private static final long DEFAULT_ALLOW_WHILE_IDLE_COMPAT_WINDOW = 9 * 60 * 1000; // 9 mins.
- // TODO (b/171306433): Change to true by default.
- private static final boolean DEFAULT_CRASH_NON_CLOCK_APPS = false;
+ private static final boolean DEFAULT_CRASH_NON_CLOCK_APPS = true;
private static final long DEFAULT_PRIORITY_ALARM_DELAY = 9 * 60_000;