summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--core/java/android/view/ViewRootImpl.java4
1 files changed, 3 insertions, 1 deletions
diff --git a/core/java/android/view/ViewRootImpl.java b/core/java/android/view/ViewRootImpl.java
index a2ff69e15915..d779b4965d4e 100644
--- a/core/java/android/view/ViewRootImpl.java
+++ b/core/java/android/view/ViewRootImpl.java
@@ -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;
}