Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

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

Change-Id: I334928f1c966cc53f978378ee3a8bbdb5ae89980
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Chris Li
2022-06-14 06:39:14 +00:00
committed by Automerger Merge Worker
parent 05f80dc05e 73bfd93217
commit 8c67207294
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/java/android/view/ViewRootImpl.java
View File

@@ -1100,7 +1100,6 @@ public final class ViewRootImpl implements ViewParent,
if (mView == null) { if (mView == null) {
mView = view; mView = view;
mAttachInfo.mDisplayState = mDisplay.getState();
mDisplayInstallOrientation = mDisplay.getInstallOrientation(); mDisplayInstallOrientation = mDisplay.getInstallOrientation();
mViewLayoutDirectionInitial = mView.getRawLayoutDirection(); mViewLayoutDirectionInitial = mView.getRawLayoutDirection();
mFallbackEventHandler.setView(view); mFallbackEventHandler.setView(view);
@@ -1312,6 +1311,9 @@ public final class ViewRootImpl implements ViewParent,
} }
registerListeners(); 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) { if ((res & WindowManagerGlobal.ADD_FLAG_USE_BLAST) != 0) {
mUseBLASTAdapter = true; mUseBLASTAdapter = true;
} }