diff options
| author | Suprabh Shukla <suprabh@google.com> | 2022-07-20 04:39:11 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2022-07-20 04:39:11 +0000 |
| commit | ee9331c0d32c3d5f23ac9db5748e01f95bc2e9b6 (patch) | |
| tree | 0ebe3af9141414546ca216a7def02be02e878abf | |
| parent | c1d13967511711d0ca4dddcaf7129618184a47dd (diff) | |
| parent | c010da3a4649a02afe256cbf6dad475c2278059b (diff) | |
| download | base-ee9331c0d32c3d5f23ac9db5748e01f95bc2e9b6.tar.gz | |
Stop crashing the system on hitting the alarm limit am: c010da3a46
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19105069
Change-Id: I0fe52c40c5e9d38ea5c4d31dd901c1c03d5f8ccb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | services/core/java/com/android/server/AlarmManagerService.java | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/services/core/java/com/android/server/AlarmManagerService.java b/services/core/java/com/android/server/AlarmManagerService.java index 386b49ebaa11..a8b7019a2dab 100644 --- a/services/core/java/com/android/server/AlarmManagerService.java +++ b/services/core/java/com/android/server/AlarmManagerService.java @@ -75,6 +75,7 @@ import android.text.format.DateFormat; import android.text.format.DateUtils; import android.util.ArrayMap; import android.util.ArraySet; +import android.util.EventLog; import android.util.KeyValueListParser; import android.util.Log; import android.util.LongArrayQueue; @@ -1761,7 +1762,11 @@ 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, maxElapsed, interval, operation, directReceiver, listenerTag, flags, true, workSource, |