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

WM: ANR window pid if activity has no active process

Browse Source 
Fixes a NPE when trying to access the activity's
ProcessRecord before calling into ActivityManager.

Test: presubmit
Fixes: 204520514
Change-Id: If89be2943a43efd7724be2294835170394049a13
This commit is contained in:
Vishnu Nair
2021-11-19 13:01:21 -08:00
parent 2ed83ecda6
commit 560f41e5c9
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
services/core/java/com/android/server/wm/ActivityRecord.java
View File

@@ -6214,15 +6214,15 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A
public boolean inputDispatchingTimedOut(String reason, int windowPid) {
ActivityRecord anrActivity;
WindowProcessController anrApp;
boolean windowFromSameProcessAsActivity;
boolean blameActivityProcess;
synchronized (mAtmService.mGlobalLock) {
anrActivity = getWaitingHistoryRecordLocked();
anrApp = app;
windowFromSameProcessAsActivity =
!hasProcess() || app.getPid() == windowPid || windowPid == INVALID_PID;
blameActivityProcess = hasProcess()
&& (app.getPid() == windowPid || windowPid == INVALID_PID);
}
if (windowFromSameProcessAsActivity) {
if (blameActivityProcess) {
return mAtmService.mAmInternal.inputDispatchingTimedOut(anrApp.mOwner,
anrActivity.shortComponentName, anrActivity.info.applicationInfo,
shortComponentName, app, false, reason);