diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2022-07-20 01:39:37 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2022-07-20 01:39:37 +0000 |
| commit | e41a97f2293291f590f032b47ff53e04d8744b08 (patch) | |
| tree | 56c4ca59074687ab314252fe237d02789e1c33fa | |
| parent | 3f0d1a79852e02c6c45e1143e608fb6c59cf3991 (diff) | |
| parent | 950fb419e77dd2e2cd39b3de0a5d628a724d49fa (diff) | |
| download | base-e41a97f2293291f590f032b47ff53e04d8744b08.tar.gz | |
Merge changes from topic "presubmit-am-3fb47bd9042c40f2b731af5a9978b6b9" into sc-qpr1-dev am: 950fb419e7
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19109495
Change-Id: Ib3093d84642819dbbdad51427ca5588bed584707
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | apex/jobscheduler/service/java/com/android/server/alarm/AlarmManagerService.java | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/apex/jobscheduler/service/java/com/android/server/alarm/AlarmManagerService.java b/apex/jobscheduler/service/java/com/android/server/alarm/AlarmManagerService.java index c9b33aa4dafc..b2d441f69c70 100644 --- a/apex/jobscheduler/service/java/com/android/server/alarm/AlarmManagerService.java +++ b/apex/jobscheduler/service/java/com/android/server/alarm/AlarmManagerService.java @@ -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); - 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, directReceiver, listenerTag, flags, workSource, alarmClock, callingUid, |