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

Merge "Fix NPE when scheduling transaction for null client" into qt-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2019-04-23 10:35:27 +00:00
committed by Android (Google) Code Review
parent 7c3708170c 4221d79ab2
commit ec4c269f94
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
services/core/java/com/android/server/wm/WindowProcessController.java
View File

@@ -98,7 +98,7 @@ public class WindowProcessController extends ConfigurationContainer<Configuratio
private final ActivityTaskManagerService mAtm; private final ActivityTaskManagerService mAtm;
// The actual proc... may be null only if 'persistent' is true (in which case we are in the // The actual proc... may be null only if 'persistent' is true (in which case we are in the
// process of launching the app) // process of launching the app)
private volatile IApplicationThread mThread; private IApplicationThread mThread;
// Currently desired scheduling class // Currently desired scheduling class
private volatile int mCurSchedGroup; private volatile int mCurSchedGroup;
// Currently computed process state // Currently computed process state
@@ -192,8 +192,11 @@ public class WindowProcessController extends ConfigurationContainer<Configuratio
return mPid; return mPid;
} }
@HotPath(caller = HotPath.PROCESS_CHANGE)
public void setThread(IApplicationThread thread) { public void setThread(IApplicationThread thread) {
mThread = thread; synchronized (mAtm.mGlobalLockWithoutBoost) {
mThread = thread;
}
} }
IApplicationThread getThread() { IApplicationThread getThread() {