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

Merge changes Ibc2f40dd,I37fb8ffc into tm-qpr-dev

Browse Source 
* changes:
  Don't perform config change if relayoutAsync
  Apply synced relayout if we have FLAG_WINDOW_VISIBILITY_CHANGED
This commit is contained in:
Tiger Huang
2022-09-16 14:23:42 +00:00
committed by Android (Google) Code Review
parent 511de5c9af f3b99eee95
commit dea70726f6
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3064,7 +3064,8 @@ public final class ViewRootImpl implements ViewParent,
// WindowManagerService has reported back a frame from a configuration not yet // WindowManagerService has reported back a frame from a configuration not yet
// handled by the client. In this case, we need to accept the configuration so we // handled by the client. In this case, we need to accept the configuration so we
// do not lay out and draw with the wrong configuration. // do not lay out and draw with the wrong configuration.
if (!mPendingMergedConfiguration.equals(mLastReportedMergedConfiguration)) { if (mRelayoutRequested
&& !mPendingMergedConfiguration.equals(mLastReportedMergedConfiguration)) {
if (DEBUG_CONFIGURATION) Log.v(mTag, "Visible with new config: " if (DEBUG_CONFIGURATION) Log.v(mTag, "Visible with new config: "
+ mPendingMergedConfiguration.getMergedConfiguration()); + mPendingMergedConfiguration.getMergedConfiguration());
performConfigurationChange(new MergedConfiguration(mPendingMergedConfiguration), performConfigurationChange(new MergedConfiguration(mPendingMergedConfiguration),
@@ -8085,7 +8086,8 @@ public final class ViewRootImpl implements ViewParent,
final int measuredWidth = mView.getMeasuredWidth(); final int measuredWidth = mView.getMeasuredWidth();
final int measuredHeight = mView.getMeasuredHeight(); final int measuredHeight = mView.getMeasuredHeight();
final boolean relayoutAsync; final boolean relayoutAsync;
if (LOCAL_LAYOUT && !mFirst && viewVisibility == mViewVisibility if (LOCAL_LAYOUT
&& (mViewFrameInfo.flags & FrameInfo.FLAG_WINDOW_VISIBILITY_CHANGED) == 0
&& mWindowAttributes.type != TYPE_APPLICATION_STARTING && mWindowAttributes.type != TYPE_APPLICATION_STARTING
&& mSyncSeqId <= mLastSyncSeqId && mSyncSeqId <= mLastSyncSeqId
&& winConfigFromAm.diff(winConfigFromWm, false /* compareUndefined */) == 0) { && winConfigFromAm.diff(winConfigFromWm, false /* compareUndefined */) == 0) {