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 am: 8c67207294 am: 68a81a2aca

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

Change-Id: Iebb8a23f4171b79115ea14517aad29f5a7c90e07
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Chris Li
2022-06-14 07:27:02 +00:00
committed by Automerger Merge Worker
parent 98d3366995 68a81a2aca
commit 394614dee4
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

@@ -1104,7 +1104,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);
@@ -1316,6 +1315,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;
}