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

Commit 950fb419 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge changes from topic "presubmit-am-3fb47bd9042c40f2b731af5a9978b6b9" into sc-qpr1-dev 

* changes:
  [automerge] Stop crashing the system on hitting the alarm limit 2p: 87fd5061
  Stop crashing the system on hitting the alarm limit
parents ccdd838e 382876da

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

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

                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,