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

Commit 6d513cdb authored by Automerger Merge Worker's avatar Automerger Merge Worker Committed by Android (Google) Code Review
Browse files

Merge "Merge "Cache OverContext to prevent deadlock" into tm-dev am:... 

Merge "Merge "Cache OverContext to prevent deadlock" into tm-dev am: 801e5c0d" into tm-mainline-prod
parents bd0fbf38 a3d7c12c

services/core/java/com/android/server/display/LocalDisplayAdapter.java

+6 −1
Original line number Diff line number Diff line
@@ -76,6 +76,8 @@ final class LocalDisplayAdapter extends DisplayAdapter { 


    private final boolean mIsBootDisplayModeSupported;



    private Context mOverlayContext;



    // Called with SyncRoot lock held.

    public LocalDisplayAdapter(DisplayManagerService.SyncRoot syncRoot,

            Context context, Handler handler, Listener listener) {
@@ -1222,7 +1224,10 @@ final class LocalDisplayAdapter extends DisplayAdapter { 


    /** Supplies a context whose Resources apply runtime-overlays */

    Context getOverlayContext() {

        return ActivityThread.currentActivityThread().getSystemUiContext();

        if (mOverlayContext == null) {

            mOverlayContext = ActivityThread.currentActivityThread().getSystemUiContext();

        }

        return mOverlayContext;

    }



    /**