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

Merge "Handle SSM thread failures better"

Browse Source
This commit is contained in:
TreeHugger Robot
2022-02-01 20:43:00 +00:00
committed by Android (Google) Code Review
parent c523daa474 1059856164
commit 5356e8161c
1 changed files with 16 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
services/core/java/com/android/server/SystemServiceManager.java
View File

@@ -576,19 +576,20 @@ public final class SystemServiceManager implements Dumpable {
return () -> {
final TimingsTraceAndSlog t = new TimingsTraceAndSlog(oldTrace);
final String serviceName = service.getClass().getName();
final int curUserId = curUser.getUserIdentifier();
t.traceBegin("ssm.on" + USER_STARTING + "User-" + curUserId + "_" + serviceName);
try {
final int curUserId = curUser.getUserIdentifier();
t.traceBegin("ssm.on" + USER_STARTING + "User-" + curUserId + "_" + serviceName);
long time = SystemClock.elapsedRealtime();
service.onUserStarting(curUser);
warnIfTooLong(SystemClock.elapsedRealtime() - time, service,
"on" + USER_STARTING + "User-" + curUserId);
t.traceEnd();
} catch (Exception e) {
Slog.wtf(TAG, "Failure reporting " + USER_STARTING + " of user " + curUser
+ " to service " + serviceName, e);
Slog.e(TAG, "Disabling thread pool - please capture a bug report.");
sUseLifecycleThreadPool = false;
} finally {
t.traceEnd();
}
};
}
@@ -601,11 +602,18 @@ public final class SystemServiceManager implements Dumpable {
final int curUserId = curUser.getUserIdentifier();
t.traceBegin("ssm.on" + USER_COMPLETED_EVENT + "User-" + curUserId
+ "_" + eventType + "_" + serviceName);
long time = SystemClock.elapsedRealtime();
service.onUserCompletedEvent(curUser, eventType);
warnIfTooLong(SystemClock.elapsedRealtime() - time, service,
"on" + USER_COMPLETED_EVENT + "User-" + curUserId);
t.traceEnd();
try {
long time = SystemClock.elapsedRealtime();
service.onUserCompletedEvent(curUser, eventType);
warnIfTooLong(SystemClock.elapsedRealtime() - time, service,
"on" + USER_COMPLETED_EVENT + "User-" + curUserId);
} catch (Exception e) {
Slog.wtf(TAG, "Failure reporting " + USER_COMPLETED_EVENT + " of user " + curUser
+ " to service " + serviceName, e);
throw e;
} finally {
t.traceEnd();
}
};
}