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

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

Change-Id: I168f020f6312fa8b6f2ea3719e85d72f9662d81f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Kriti Dang
2022-09-02 11:09:20 +00:00
committed by Automerger Merge Worker

View File

@@ -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;
}