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

Commit 3d7a4bae authored by Rachel Lee's avatar Rachel Lee Committed by Automerger Merge Worker
Browse files

Merge "Add TestApi to WM refresh rate param." into udc-dev am: 7843505d 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23504801



Change-Id: I3c1a28ab9bf99733b638e14890bec743dc80fea1
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents b535b799 7843505d

core/api/test-current.txt

+2 −0
Original line number Diff line number Diff line
@@ -3568,6 +3568,8 @@ package android.view { 
    field public static final int ACCESSIBILITY_TITLE_CHANGED = 33554432; // 0x2000000

    field public static final int FLAG_SLIPPERY = 536870912; // 0x20000000

    field public CharSequence accessibilityTitle;

    field public float preferredMaxDisplayRefreshRate;

    field public float preferredMinDisplayRefreshRate;

    field public int privateFlags;

  }

core/java/android/view/WindowManager.java

+2 −0
Original line number Diff line number Diff line
@@ -3763,6 +3763,7 @@ public interface WindowManager extends ViewManager { 
         * This value is ignored if {@link #preferredDisplayModeId} is set.

         * @hide

         */

        @TestApi

        public float preferredMinDisplayRefreshRate;



        /**
@@ -3771,6 +3772,7 @@ public interface WindowManager extends ViewManager { 
         * This value is ignored if {@link #preferredDisplayModeId} is set.

         * @hide

         */

        @TestApi

        public float preferredMaxDisplayRefreshRate;



        /** Indicates whether this window wants the HDR conversion is disabled. */