Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d4fef4dc authored by Louis Chang's avatar Louis Chang Committed by android-build-merger
Browse files

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

am: ec4c269f

Change-Id: I404d1bcbd00a6db869d92e4ca4af1b05d7a3d7b9
parents d7b885d8 ec4c269f
Loading
Loading
Loading
Loading
+5 −2
Original line number Diff line number Diff line
@@ -98,7 +98,7 @@ public class WindowProcessController extends ConfigurationContainer<Configuratio
    private final ActivityTaskManagerService mAtm;
    // The actual proc...  may be null only if 'persistent' is true (in which case we are in the
    // process of launching the app)
    private volatile IApplicationThread mThread;
    private IApplicationThread mThread;
    // Currently desired scheduling class
    private volatile int mCurSchedGroup;
    // Currently computed process state
@@ -192,9 +192,12 @@ public class WindowProcessController extends ConfigurationContainer<Configuratio
        return mPid;
    }

    @HotPath(caller = HotPath.PROCESS_CHANGE)
    public void setThread(IApplicationThread thread) {
        synchronized (mAtm.mGlobalLockWithoutBoost) {
            mThread = thread;
        }
    }

    IApplicationThread getThread() {
        return mThread;