From 1e5c50bbe3fab2558e1dd8f6061be0c6ad1b8569 Mon Sep 17 00:00:00 2001 From: Ady Abraham Date: Tue, 29 Jun 2021 15:48:11 -0700 Subject: [PATCH] RefreshRatePolicy: getPreferredRefreshRate should consider preferredRefreshRate If an app set the WindowManager.LayoutParams#preferredRefreshRate, refresh rate policy should return it the the preferred refresh rate of the window if all the other signals (preferredDisplayModeId or deny list) doesn't have a vote. Test: atest RefreshRatePolicyTest FrameRateSelectionPriorityTests Bug: 192413241 Change-Id: I55dc5c2acc8b66cfedbd0c0f0fb66c57eeaa36fe --- .../android/server/wm/RefreshRatePolicy.java | 4 +++ .../wm/FrameRateSelectionPriorityTests.java | 30 ++++++++++++++++++- 2 files changed, 33 insertions(+), 1 deletion(-) diff --git a/services/core/java/com/android/server/wm/RefreshRatePolicy.java b/services/core/java/com/android/server/wm/RefreshRatePolicy.java index 6bc42af2bb686..a7c1b578700ee 100644 --- a/services/core/java/com/android/server/wm/RefreshRatePolicy.java +++ b/services/core/java/com/android/server/wm/RefreshRatePolicy.java @@ -151,6 +151,10 @@ class RefreshRatePolicy { } } + if (w.mAttrs.preferredRefreshRate != 0) { + return w.mAttrs.preferredRefreshRate; + } + return 0; } diff --git a/services/tests/wmtests/src/com/android/server/wm/FrameRateSelectionPriorityTests.java b/services/tests/wmtests/src/com/android/server/wm/FrameRateSelectionPriorityTests.java index e6348a50566c9..13ebc932fcef3 100644 --- a/services/tests/wmtests/src/com/android/server/wm/FrameRateSelectionPriorityTests.java +++ b/services/tests/wmtests/src/com/android/server/wm/FrameRateSelectionPriorityTests.java @@ -228,7 +228,7 @@ public class FrameRateSelectionPriorityTests extends WindowTestsBase { } @Test - public void testPreferredRefreshRate() { + public void testDenyListPreferredRefreshRate() { final WindowState appWindow = createWindow("appWindow"); assertNotNull("Window state is created", appWindow); when(appWindow.getDisplayContent().getDisplayPolicy()).thenReturn(mDisplayPolicy); @@ -281,4 +281,32 @@ public class FrameRateSelectionPriorityTests extends WindowTestsBase { verify(appWindow.getPendingTransaction(), never()).setFrameRate( any(SurfaceControl.class), anyInt(), anyInt(), anyInt()); } + + @Test + public void testAppPreferredRefreshRate() { + final WindowState appWindow = createWindow("appWindow"); + assertNotNull("Window state is created", appWindow); + when(appWindow.getDisplayContent().getDisplayPolicy()).thenReturn(mDisplayPolicy); + + appWindow.mAttrs.packageName = "com.android.test"; + appWindow.mAttrs.preferredRefreshRate = 60; + + assertEquals(0, mRefreshRatePolicy.getPreferredModeId(appWindow)); + assertEquals(60, mRefreshRatePolicy.getPreferredRefreshRate(appWindow), FLOAT_TOLERANCE); + + appWindow.updateFrameRateSelectionPriorityIfNeeded(); + assertEquals(RefreshRatePolicy.LAYER_PRIORITY_UNSET, appWindow.mFrameRateSelectionPriority); + assertEquals(60, appWindow.mAppPreferredFrameRate, FLOAT_TOLERANCE); + + // Call the function a few times. + appWindow.updateFrameRateSelectionPriorityIfNeeded(); + appWindow.updateFrameRateSelectionPriorityIfNeeded(); + + // Since nothing changed in the priority state, the transaction should not be updating. + verify(appWindow.getPendingTransaction(), never()).setFrameRateSelectionPriority( + any(SurfaceControl.class), anyInt()); + verify(appWindow.getPendingTransaction(), times(1)).setFrameRate( + appWindow.getSurfaceControl(), 60, + Surface.FRAME_RATE_COMPATIBILITY_EXACT, Surface.CHANGE_FRAME_RATE_ALWAYS); + } }