diff options
| author | 2020-07-14 01:54:07 +0000 | |
|---|---|---|
| committer | 2020-07-14 01:54:07 +0000 | |
| commit | ee8085ad1a8cb65b461a240dda653bbe9bae4ba1 (patch) | |
| tree | 25eb979e937007e49f7f438b7a77002abdd868d9 | |
| parent | f1a6972937d72d716d5b75d73daae7e3959fb5e9 (diff) | |
| parent | b42083b06a38e221bd00315aea8cc4ac942e9abb (diff) | |
Merge "RESTRICT AUTOMERGE Turning off wtf logging for alarm limit" into rvc-dev
| -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); |