From b20c5a1d49d683944e6b01323a83a8374bb002e3 Mon Sep 17 00:00:00 2001
From: Santos Cordon <santoscordon@google.com>
Date: Thu, 31 Mar 2022 18:32:14 +0000
Subject: [PATCH] Undeprecate LayoutParams.preferredRefreshRate

This was previously deprecated in favor of preferredDisplayModeId.
However, display modes include specific resolutions
so we would still need an API for the valid use-case
of specifying only a preferred refresh rate.

Bug: 227627158
Bug: 224915081
Test: built locally
Change-Id: Ic7c711d03d3ccc7a5193b26ca38159f048777927
---
 core/api/current.txt                      | 2 +-
 core/java/android/view/WindowManager.java | 2 --
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/core/api/current.txt b/core/api/current.txt
index c7b8d32f77a98..0457b9f5a29b0 100644
--- a/core/api/current.txt
+++ b/core/api/current.txt
@@ -51602,7 +51602,7 @@ package android.view {
     field public String packageName;
     field public boolean preferMinimalPostProcessing;
     field public int preferredDisplayModeId;
-    field @Deprecated public float preferredRefreshRate;
+    field public float preferredRefreshRate;
     field public int rotationAnimation;
     field public float screenBrightness;
     field public int screenOrientation;
diff --git a/core/java/android/view/WindowManager.java b/core/java/android/view/WindowManager.java
index 45169efd7d356..8e9f9d9fb4f39 100644
--- a/core/java/android/view/WindowManager.java
+++ b/core/java/android/view/WindowManager.java
@@ -3107,9 +3107,7 @@ public interface WindowManager extends ViewManager {
          * This value is ignored if {@link #preferredDisplayModeId} is set.
          *
          * @see Display#getSupportedRefreshRates()
-         * @deprecated use {@link #preferredDisplayModeId} instead
          */
-        @Deprecated
         public float preferredRefreshRate;
 
         /**