From 7ec018ad6bac39b62edaef4e9851a88d322a991a Mon Sep 17 00:00:00 2001
From: Ady Abraham <adyabr@google.com>
Date: Sat, 21 Jan 2023 00:29:14 +0000
Subject: [PATCH] Revert "DMD: enable frame rate override "

Revert submission 20885603-enable_frame_rate_override

Reason for revert: b/264952266

Reverted changes: /q/submissionid:20885603-enable_frame_rate_override

Change-Id: Id2e2c241a439101517f011453d4d23ace777d11f
---
 .../com/android/server/display/DisplayModeDirector.java     | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/services/core/java/com/android/server/display/DisplayModeDirector.java b/services/core/java/com/android/server/display/DisplayModeDirector.java
index c960416b63285..f8d6c5f3ea4de 100644
--- a/services/core/java/com/android/server/display/DisplayModeDirector.java
+++ b/services/core/java/com/android/server/display/DisplayModeDirector.java
@@ -3081,10 +3081,10 @@ public class DisplayModeDirector {
 
         @Override
         public boolean supportsFrameRateOverride() {
-            return SurfaceFlingerProperties.enable_frame_rate_override().orElse(true)
+            return SurfaceFlingerProperties.enable_frame_rate_override().orElse(false)
                             && !SurfaceFlingerProperties.frame_rate_override_for_native_rates()
-                                    .orElse(false)
-                            && SurfaceFlingerProperties.frame_rate_override_global().orElse(true);
+                                    .orElse(true)
+                            && SurfaceFlingerProperties.frame_rate_override_global().orElse(false);
         }
 
         private DisplayManager getDisplayManager() {