Merge "Fix the problem that the turn_screen_on Activity does not draw." am: 76c76a86c4
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2120896 Change-Id: I338477042e258ad366a7d6d83ac09c89f73bf1ea Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
@@ -1035,7 +1035,6 @@ public final class ViewRootImpl implements ViewParent,
|
||||
if (mView == null) {
|
||||
mView = view;
|
||||
|
||||
mAttachInfo.mDisplayState = mDisplay.getState();
|
||||
mViewLayoutDirectionInitial = mView.getRawLayoutDirection();
|
||||
mFallbackEventHandler.setView(view);
|
||||
mWindowAttributes.copyFrom(attrs);
|
||||
@@ -1229,6 +1228,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;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user