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

Commit c141ced1 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: cc77f683

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



Change-Id: I02b43a6f069f820e7806cf12784091bb0fc0d733
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents dec8d4af cc77f683

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

+6 −1
Original line number Original line Diff line number Diff line
@@ -112,6 +112,7 @@ import android.text.TextUtils; 
import android.text.format.DateFormat;

import android.text.format.DateFormat;

import android.util.ArrayMap;

import android.util.ArrayMap;

import android.util.ArraySet;

import android.util.ArraySet;

import android.util.EventLog;

import android.util.IndentingPrintWriter;

import android.util.IndentingPrintWriter;

import android.util.Log;

import android.util.Log;

import android.util.LongArrayQueue;

import android.util.LongArrayQueue;
@@ -2299,7 +2300,11 @@ public class AlarmManagerService extends SystemService { 
                                + " reached for uid: " + UserHandle.formatUid(callingUid)

                                + " reached for uid: " + UserHandle.formatUid(callingUid)

                                + ", callingPackage: " + callingPackage;

                                + ", callingPackage: " + callingPackage;

                Slog.w(TAG, errorMsg);

                Slog.w(TAG, errorMsg);

                if (callingUid != Process.SYSTEM_UID) {

                    throw new IllegalStateException(errorMsg);

                    throw new IllegalStateException(errorMsg);

                } else {

                    EventLog.writeEvent(0x534e4554, "234441463", -1, errorMsg);

                }

            }

            }

            setImplLocked(type, triggerAtTime, triggerElapsed, windowLength, interval, operation,

            setImplLocked(type, triggerAtTime, triggerElapsed, windowLength, interval, operation,

                    directReceiver, listenerTag, flags, workSource, alarmClock, callingUid,

                    directReceiver, listenerTag, flags, workSource, alarmClock, callingUid,