Merge "Ignore the prefModeId only for PiP windows, rather than all non-focussed windows." into tm-qpr-dev

2022-09-02 10:38:34 +00:00
parent abcf028aa9 752223386f
commit 7b51215447
1 changed files with 3 additions and 1 deletions
--- a/services/core/java/com/android/server/wm/DisplayContent.java
+++ b/services/core/java/com/android/server/wm/DisplayContent.java
@@ -982,7 +982,9 @@ class DisplayContent extends RootDisplayArea implements WindowManagerPolicy.Disp

                final int preferredModeId = getDisplayPolicy().getRefreshRatePolicy()
                        .getPreferredModeId(w);
-                if (w.isFocused() && mTmpApplySurfaceChangesTransactionState.preferredModeId == 0
+
+                if (w.getWindowingMode() != WINDOWING_MODE_PINNED
+                        && mTmpApplySurfaceChangesTransactionState.preferredModeId == 0
                        && preferredModeId != 0) {
                    mTmpApplySurfaceChangesTransactionState.preferredModeId = preferredModeId;
                }