diff options
| author | 2022-04-01 10:43:35 +0000 | |
|---|---|---|
| committer | 2022-04-01 10:43:35 +0000 | |
| commit | cf4d6368e1bef8e43e6dc3b267211a72cf2cbe8d (patch) | |
| tree | 63411eea82e939f1562d5e531dad2a95d9ae2c95 | |
| parent | 8b12d853d845abe69df39cc46eb2712606e485f5 (diff) | |
| parent | b20c5a1d49d683944e6b01323a83a8374bb002e3 (diff) | |
Merge "Undeprecate LayoutParams.preferredRefreshRate" into tm-dev
| -rw-r--r-- | core/api/current.txt | 2 | ||||
| -rw-r--r-- | core/java/android/view/WindowManager.java | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/core/api/current.txt b/core/api/current.txt index 84aaa44038d2..349324b0459a 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 45169efd7d35..8e9f9d9fb4f3 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; /** |