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

Merge "WMS AnrController: Don't hold WMS lock when calling into AMS"

Browse Source
This commit is contained in:
TreeHugger Robot
2022-10-01 00:01:31 +00:00
committed by Android (Google) Code Review
parent 4af9b97bcc 21d46e388d
commit c7aa780f61
1 changed files with 22 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
services/core/java/com/android/server/wm/AnrController.java
View File

@@ -70,6 +70,9 @@ class AnrController {
preDumpIfLockTooSlow();
final ActivityRecord activity;
timeoutRecord.mLatencyTracker.waitingOnGlobalLockStarted();
boolean blamePendingFocusRequest = false;
IBinder focusToken = null;
WindowState targetWindowState = null;
synchronized (mService.mGlobalLock) {
timeoutRecord.mLatencyTracker.waitingOnGlobalLockEnded();
activity = ActivityRecord.forTokenLocked(applicationHandle.token);
@@ -82,35 +85,36 @@ class AnrController {
// App is unresponsive, but we are actively trying to give focus to a window.
// Blame the window if possible since the window may not belong to the app.
DisplayContent display = mService.mRoot.getDisplayContent(activity.getDisplayId());
IBinder focusToken =
display == null ? null : display.getInputMonitor().mInputFocus;
if (display != null) {
focusToken = display.getInputMonitor().mInputFocus;
}
InputTarget focusTarget = mService.getInputTargetFromToken(focusToken);
if (focusTarget != null) {
// Check if we have a recent focus request, newer than the dispatch timeout,
// then ignore the focus request.
WindowState targetWindowState = focusTarget.getWindowState();
boolean requestIsValid = SystemClock.uptimeMillis()
targetWindowState = focusTarget.getWindowState();
blamePendingFocusRequest = SystemClock.uptimeMillis()
- display.getInputMonitor().mInputFocusRequestTimeMillis
>= getInputDispatchingTimeoutMillisLocked(
targetWindowState.getActivityRecord());
if (requestIsValid) {
if (notifyWindowUnresponsive(focusToken, timeoutRecord)) {
Slog.i(TAG_WM, "Blamed " + focusTarget.getWindowState().getName()
+ " using pending focus request. Focused activity: "
+ activity.getName());
return;
}
}
}
Slog.i(TAG_WM, "ANR in " + activity.getName() + ". Reason: "
+ timeoutRecord.mReason);
dumpAnrStateLocked(activity, null /* windowState */, timeoutRecord.mReason);
mUnresponsiveAppByDisplay.put(activity.getDisplayId(), activity);
if (!blamePendingFocusRequest) {
Slog.i(TAG_WM, "ANR in " + activity.getName() + ". Reason: "
+ timeoutRecord.mReason);
dumpAnrStateLocked(activity, null /* windowState */, timeoutRecord.mReason);
mUnresponsiveAppByDisplay.put(activity.getDisplayId(), activity);
}
}
if (blamePendingFocusRequest && notifyWindowUnresponsive(focusToken, timeoutRecord)) {
Slog.i(TAG_WM, "Blamed " + targetWindowState.getName()
+ " using pending focus request. Focused activity: "
+ activity.getName());
} else {
activity.inputDispatchingTimedOut(timeoutRecord, INVALID_PID);
}
activity.inputDispatchingTimedOut(timeoutRecord, INVALID_PID);
} finally {
Trace.traceEnd(Trace.TRACE_TAG_ACTIVITY_MANAGER);
}