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

Commit 4a20c942 authored by Charles Chen's avatar Charles Chen Committed by Android (Google) Code Review
Browse files

Merge "Move initialization from onCreate to attachBaseContext" into sc-v2-dev

parents 2e8baa10 dd4a748a

core/java/android/window/WindowProviderService.java

+11 −6
Original line number Diff line number Diff line
@@ -53,6 +53,7 @@ public abstract class WindowProviderService extends Service { 
    private final WindowTokenClient mWindowToken = new WindowTokenClient();

    private final WindowContextController mController = new WindowContextController(mWindowToken);

    private WindowManager mWindowManager;

    private boolean mInitialized;



    /**

     * Returns the type of this {@link WindowProviderService}.
@@ -122,13 +123,17 @@ public abstract class WindowProviderService extends Service { 
        return context.createTokenContext(mWindowToken, display);

    }



    @CallSuper

    /** @hide */

    @Override

    public void onCreate() {

        super.onCreate();

    protected void attachBaseContext(Context newBase) {

        super.attachBaseContext(newBase);

        if (!mInitialized) {

            mWindowToken.attachContext(this);

        mController.attachToDisplayArea(getWindowType(), getDisplayId(), getWindowContextOptions());

            mController.attachToDisplayArea(getWindowType(), getDisplayId(),

                    getWindowContextOptions());

            mWindowManager = WindowManagerImpl.createWindowContextWindowManager(this);

            mInitialized = true;

        }

    }



    @SuppressLint("OnNameExpected")