diff options
| author | 2022-07-19 17:23:52 +0000 | |
|---|---|---|
| committer | 2022-07-19 17:23:52 +0000 | |
| commit | 992a1b29a1cabba79703997808265f64900f5aed (patch) | |
| tree | 3bc5f105b7adfe5320f45a4eaa29b11397115420 | |
| parent | 826e83e125291b55e8f0bd531dad05c6716a022b (diff) | |
| parent | 8afb230aa05441fdf79b90437659300d530a0142 (diff) | |
Merge "Stop crashing the system on hitting the alarm limit" into tm-dev am: 8afb230aa0
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19122700
Change-Id: I125544061b6e66eb7b0722d7c0f6c43e56c37422
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | apex/jobscheduler/service/java/com/android/server/alarm/AlarmManagerService.java | 7 |
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 0de0a1cf9c8e..d6b246a9e2e3 100644 --- a/apex/jobscheduler/service/java/com/android/server/alarm/AlarmManagerService.java +++ b/apex/jobscheduler/service/java/com/android/server/alarm/AlarmManagerService.java @@ -112,6 +112,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; @@ -2299,7 +2300,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, |