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

Commit bda14d04 authored by Charles Chen's avatar Charles Chen
Browse files

Fix that WindowContext token is always null 

fixes: 148921212
Test: manual
Change-Id: I5b4a28eb2f6cbe5950edee6876d450f4fc89f46f
parent e3ada502

core/java/android/app/WindowContext.java

+2 −2
Original line number Diff line number Diff line
@@ -60,12 +60,12 @@ public class WindowContext extends ContextWrapper { 
        if (token != null && !isWindowToken(token)) {

            throw new IllegalArgumentException("Token must be registered to server.");

        }

        mToken = token != null ? token : new Binder();



        final ContextImpl contextImpl = createBaseWindowContext(base, token);

        final ContextImpl contextImpl = createBaseWindowContext(base, mToken);

        attachBaseContext(contextImpl);

        contextImpl.setOuterContext(this);



        mToken = token != null ? token : new Binder();

        mDisplayId = getDisplayId();

        mWindowManager = new WindowManagerImpl(this);

        mWindowManager.setDefaultToken(mToken);