summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Suprabh Shukla <suprabh@google.com> 2022-06-28 23:49:23 +0000
committer Presubmit Automerger Backend <android-build-presubmit-automerger-backend@system.gserviceaccount.com> 2022-06-28 23:49:23 +0000
commitb7d6952de79925e95787a8e16cc860760d09e567 (patch)
tree5ae1984abdfb17d7c7f88e09f17fa66645dbe173
parent0992057b97429800a86309a6cb5115389ef59117 (diff)
parent87fd506129631225581de641c4dd9956a15aa0ab (diff)
[automerge] Stop crashing the system on hitting the alarm limit 2p: 87fd506129
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19109495 Bug: 234441463 Change-Id: I34e300251010cb9a9bd1eb8d2b659579da2d5d31 Merged-In: Id5e94d44ac9ab24870a8213ec7583da0f592a5ff
-rw-r--r--apex/jobscheduler/service/java/com/android/server/alarm/AlarmManagerService.java7
1 files changed, 6 insertions, 1 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 95728081bdb9..d1e3481b1107 100644
--- a/apex/jobscheduler/service/java/com/android/server/alarm/AlarmManagerService.java
+++ b/apex/jobscheduler/service/java/com/android/server/alarm/AlarmManagerService.java
@@ -104,6 +104,7 @@ import android.text.TextUtils;
import android.text.format.DateFormat;
import android.util.ArrayMap;
import android.util.ArraySet;
+import android.util.EventLog;
import android.util.IndentingPrintWriter;
import android.util.Log;
import android.util.LongArrayQueue;
@@ -2031,7 +2032,11 @@ public class AlarmManagerService extends SystemService {
+ " reached for uid: " + UserHandle.formatUid(callingUid)
+ ", callingPackage: " + callingPackage;
Slog.w(TAG, errorMsg);
- throw new IllegalStateException(errorMsg);
+ if (callingUid != Process.SYSTEM_UID) {
+ throw new IllegalStateException(errorMsg);
+ } else {
+ EventLog.writeEvent(0x534e4554, "234441463", -1, errorMsg);
+ }
}
setImplLocked(type, triggerAtTime, triggerElapsed, windowLength, interval, operation,
directReceiver, listenerTag, flags, workSource, alarmClock, callingUid,