Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 252c5dbc authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Stop crashing the system on hitting the alarm limit" into tm-dev am:... 

Merge "Stop crashing the system on hitting the alarm limit" into tm-dev am: 8afb230a am: 992a1b29

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19122700



Change-Id: Id7d1ac13abe6fc306a6e23bf6708834baf370e75
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 3a80728c 992a1b29

apex/jobscheduler/service/java/com/android/server/alarm/AlarmManagerService.java

+6 −1
Original line number Diff line number Diff line
@@ -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);

                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,