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

Merge "RESTRICT AUTOMERGE Turning off wtf logging for alarm limit" into rvc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2020-07-14 01:54:07 +00:00
committed by Android (Google) Code Review
parent f1a6972937 b42083b06a
commit ee8085ad1a
1 changed files with 2 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
services/core/java/com/android/server/AlarmManagerService.java
View File

@@ -150,8 +150,6 @@ class AlarmManagerService extends SystemService {
// TODO (b/157782538): Turn off once bug is fixed. // TODO (b/157782538): Turn off once bug is fixed.
static final boolean DEBUG_PER_UID_LIMIT = true; 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_ALARMS_IN_HISTORY = true;
static final boolean RECORD_DEVICE_IDLE_ALARMS = false; 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 "Maximum limit of concurrent alarms " + mConstants.MAX_ALARMS_PER_UID
+ " reached for uid: " + UserHandle.formatUid(callingUid) + " reached for uid: " + UserHandle.formatUid(callingUid)
+ ", callingPackage: " + callingPackage; + ", 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); Slog.w(TAG, errorMsg);
} if (DEBUG_PER_UID_LIMIT && UserHandle.isCore(callingUid)) {
if (DEBUG_PER_UID_LIMIT) {
logAllAlarmsForUidLocked(callingUid); logAllAlarmsForUidLocked(callingUid);
} }
throw new IllegalStateException(errorMsg); throw new IllegalStateException(errorMsg);