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

Merge "[RESTRICT AUTOMERGE] Always set last report configuration for starting window." into tm-qpr-dev

Browse Source
This commit is contained in:
Wei Sheng Shih
2023-05-02 01:52:27 +00:00
committed by Android (Google) Code Review
parent 6535b8e272 b6b5861513
commit 1d3261e126
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
services/core/java/com/android/server/wm/WindowState.java
View File

@@ -3867,7 +3867,11 @@ class WindowState extends WindowContainer<WindowState> implements WindowManagerP
// configuration update when the window has requested to be hidden. Doing so can lead to // configuration update when the window has requested to be hidden. Doing so can lead to
// the client erroneously accepting a configuration that would have otherwise caused an // the client erroneously accepting a configuration that would have otherwise caused an
// activity restart. We instead hand back the last reported {@link MergedConfiguration}. // activity restart. We instead hand back the last reported {@link MergedConfiguration}.
// Also note since starting window isn't a window of activity, it won't make activity
// restart, so here should allow starting window to set the last reported configuration
// during relayout, which could happen before activity request visible.
if (useLatestConfig || (relayoutVisible && (mActivityRecord == null if (useLatestConfig || (relayoutVisible && (mActivityRecord == null
|| mAttrs.type == TYPE_APPLICATION_STARTING
|| mActivityRecord.isVisibleRequested()))) { || mActivityRecord.isVisibleRequested()))) {
final Configuration globalConfig = getProcessGlobalConfiguration(); final Configuration globalConfig = getProcessGlobalConfiguration();
final Configuration overrideConfig = getMergedOverrideConfiguration(); final Configuration overrideConfig = getMergedOverrideConfiguration();