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

Commit cc77f683 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: 8afb230a 

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



Change-Id: I449b0cbe341827b667d096ca2a4e50f1461afb6d
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents d6ed513d 8afb230a

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,