diff options
| author | Suprabh Shukla <suprabh@google.com> | 2020-07-14 02:25:46 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-07-14 02:25:46 +0000 |
| commit | d52540e49c705be987ea3f76367f8e55ff042dd2 (patch) | |
| tree | 409da179789bd0987c263de5d29435cdef4ce17d | |
| parent | 9b6c886f1a4cdab38ea023cf78e0dcf8c6f5f79c (diff) | |
| parent | a5a8e14e245fde3adf223c2bc5c1b57873699932 (diff) | |
RESTRICT AUTOMERGE Turning off wtf logging for alarm limit am: b42083b06a am: a5a8e14e24
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12142736
Change-Id: Idd7ae9a5ddc09af5ad2cf4a6ea43ac27d3d3a8f7
| -rw-r--r-- | services/core/java/com/android/server/AlarmManagerService.java | 17 |
1 files changed, 2 insertions, 15 deletions
diff --git a/services/core/java/com/android/server/AlarmManagerService.java b/services/core/java/com/android/server/AlarmManagerService.java index d51ca6e9ab42..4fab067d1d3b 100644 --- a/services/core/java/com/android/server/AlarmManagerService.java +++ b/services/core/java/com/android/server/AlarmManagerService.java @@ -150,8 +150,6 @@ class AlarmManagerService extends SystemService { // TODO (b/157782538): Turn off once bug is fixed. static final boolean DEBUG_PER_UID_LIMIT = true; - // TODO (b/157782538): Turn off once bug is fixed. - static final boolean WARN_SYSTEM_ON_ALARM_LIMIT = true; static final boolean RECORD_ALARMS_IN_HISTORY = true; static final boolean RECORD_DEVICE_IDLE_ALARMS = false; @@ -1774,19 +1772,8 @@ class AlarmManagerService extends SystemService { "Maximum limit of concurrent alarms " + mConstants.MAX_ALARMS_PER_UID + " reached for uid: " + UserHandle.formatUid(callingUid) + ", callingPackage: " + callingPackage; - - if (WARN_SYSTEM_ON_ALARM_LIMIT && UserHandle.isCore(callingUid)) { - final StringWriter logWriter = new StringWriter(); - final PrintWriter pw = new PrintWriter(logWriter); - pw.println(errorMsg); - pw.println("Next 20 alarms for " + callingUid + ":"); - dumpUpcomingNAlarmsForUid(pw, callingUid, 20); - pw.flush(); - Slog.wtf(TAG, logWriter.toString()); - } else { - Slog.w(TAG, errorMsg); - } - if (DEBUG_PER_UID_LIMIT) { + Slog.w(TAG, errorMsg); + if (DEBUG_PER_UID_LIMIT && UserHandle.isCore(callingUid)) { logAllAlarmsForUidLocked(callingUid); } throw new IllegalStateException(errorMsg); |