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

Commit 68a81a2a authored by Chris Li's avatar Chris Li Committed by Automerger Merge Worker
Browse files

Merge "Fix the problem that the turn_screen_on Activity does not draw." into... 

Merge "Fix the problem that the turn_screen_on Activity does not draw." into tm-dev-plus-aosp am: 73bfd932 am: 8c672072

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18871668



Change-Id: I4d84bd9ad38d6ef2ea77a0a310710cbe7220999a
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 06a6d428 8c672072

core/java/android/view/ViewRootImpl.java

+3 −1
Original line number Diff line number Diff line
@@ -1103,7 +1103,6 @@ public final class ViewRootImpl implements ViewParent, 
            if (mView == null) {

                mView = view;



                mAttachInfo.mDisplayState = mDisplay.getState();

                mDisplayInstallOrientation = mDisplay.getInstallOrientation();

                mViewLayoutDirectionInitial = mView.getRawLayoutDirection();

                mFallbackEventHandler.setView(view);
@@ -1315,6 +1314,9 @@ public final class ViewRootImpl implements ViewParent, 
                }



                registerListeners();

                // We should update mAttachInfo.mDisplayState after registerDisplayListener

                // because displayState might be changed before registerDisplayListener.

                mAttachInfo.mDisplayState = mDisplay.getState();

                if ((res & WindowManagerGlobal.ADD_FLAG_USE_BLAST) != 0) {

                    mUseBLASTAdapter = true;

                }