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 | 8b2f5cecd16e7c35007cbad75ad0ef72828dbbda (patch) | |
| tree | ca4cbaf6a21ba5de5cd74231a1930ac2010ebe49 | |
| parent | fd03677090543d3ea6542adb2153cb8de0160eda (diff) | |
| parent | 87fd506129631225581de641c4dd9956a15aa0ab (diff) | |
| download | base-8b2f5cecd16e7c35007cbad75ad0ef72828dbbda.tar.gz | |
Merge "Stop crashing the system on hitting the alarm limit" into sc-dev
| -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, |