Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
* changes:
  [automerge] Stop crashing the system on hitting the alarm limit 2p: 87fd506129
  Stop crashing the system on hitting the alarm limit
This commit is contained in:
TreeHugger Robot
2022-07-20 01:17:36 +00:00
committed by Android (Google) Code Review
parent ccdd838e56 382876da01
commit 950fb419e7
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
apex/jobscheduler/service/java/com/android/server/alarm/AlarmManagerService.java
View File

@@ -104,6 +104,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;
@@ -2031,7 +2032,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);
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, interval, operation, setImplLocked(type, triggerAtTime, triggerElapsed, windowLength, interval, operation,
directReceiver, listenerTag, flags, workSource, alarmClock, callingUid, directReceiver, listenerTag, flags, workSource, alarmClock, callingUid,