diff options
| author | Suprabh Shukla <suprabh@google.com> | 2022-06-27 14:01:16 -0700 |
|---|---|---|
| committer | Suprabh Shukla <suprabh@google.com> | 2022-07-20 01:48:40 +0000 |
| commit | c010da3a4649a02afe256cbf6dad475c2278059b (patch) | |
| tree | d4b49af58e18cf96a5ebafb6e896f02911f5bae4 | |
| parent | c38cc3e355718577192da8f544d21fd0be5f6be2 (diff) | |
| download | base-c010da3a4649a02afe256cbf6dad475c2278059b.tar.gz | |
Stop crashing the system on hitting the alarm limit
Exempting the system as a runtime restart is not clearly
better than extreme memory and computation pressure that can result from
the originating spam.
Callers in the system should guard against any spammy requests that lead
them to create a lot of alarms.
Test: Builds, boots and existing tests should pass.
atest CtsAlarmManagerTestCases:UidCapTests
atest FrameworksMockingServicesTests:AlarmManagerServiceTest
Bug: 234441463
Change-Id: Id5e94d44ac9ab24870a8213ec7583da0f592a5ff
(cherry picked from commit 3b9f3f4a0f5a661be65e287996cae8a4481a1453)
Merged-In: Id5e94d44ac9ab24870a8213ec7583da0f592a5ff
| -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 d16244167c62..11726e028499 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; @@ -1768,7 +1769,11 @@ class AlarmManagerService extends SystemService { mHandler.obtainMessage(AlarmHandler.UNREGISTER_CANCEL_LISTENER, operation).sendToTarget(); 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, |