Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 70327b32 authored by Automerger Merge Worker's avatar Automerger Merge Worker Committed by Android (Google) Code Review
Browse files

Merge "Merge "Ignore the prefModeId only for PiP windows, rather than all... 

Merge "Merge "Ignore the prefModeId only for PiP windows, rather than all non-focussed windows." into tm-qpr-dev am: 7b512154 am: c7c8502b"
parents 0e377ef8 baa496d8

services/core/java/com/android/server/wm/DisplayContent.java

+3 −1
Original line number Diff line number Diff line
@@ -986,7 +986,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;

                }