diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2022-07-20 01:17:36 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2022-07-20 01:17:36 +0000 |
| commit | cb1451fb7fc039ede64788c289afc7a641ebbb86 (patch) | |
| tree | 5644d7afe4c5913386be80a1c6fa0de5cbd9de7d | |
| parent | d1e53dc1dc45a5f525b527cc409fb883bd9b77d6 (diff) | |
| parent | b7d6952de79925e95787a8e16cc860760d09e567 (diff) | |
| download | base-cb1451fb7fc039ede64788c289afc7a641ebbb86.tar.gz | |
Merge changes from topic "presubmit-am-3fb47bd9042c40f2b731af5a9978b6b9" into sc-mainline-prod
* changes:
[automerge] Stop crashing the system on hitting the alarm limit 2p: 87fd506129
Stop crashing the system on hitting the alarm limit
| -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 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, |