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

Commit 5b307aba authored by Rachel Lee's avatar Rachel Lee Committed by Android (Google) Code Review
Browse files

Merge changes from topics "revert-25035744-wmtestflag-JQLPGZOMVG", "wm-testapi-suppress" into main 

* changes:
  SuppressLint of UnflaggedApi in WM @TestApi
  Revert "Flag WindowManager refresh rate fields for test"
parents c72510de 1280c4f3

core/api/test-current.txt

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

    field public static final int ACCESSIBILITY_TITLE_CHANGED = 33554432; // 0x2000000

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

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

    field public CharSequence accessibilityTitle;

    field public CharSequence accessibilityTitle;

    field @FlaggedApi("android.view.flags.wm_display_refresh_rate_test") public float preferredMaxDisplayRefreshRate;

    field public float preferredMaxDisplayRefreshRate;

    field @FlaggedApi("android.view.flags.wm_display_refresh_rate_test") public float preferredMinDisplayRefreshRate;

    field public float preferredMinDisplayRefreshRate;

    field public int privateFlags;

    field public int privateFlags;

  }

  }

core/java/android/view/WindowManager.java

+2 −3
Original line number Original line Diff line number Diff line
@@ -17,7 +17,6 @@ 
package android.view;

package android.view;





import static android.content.pm.ActivityInfo.COLOR_MODE_DEFAULT;

import static android.content.pm.ActivityInfo.COLOR_MODE_DEFAULT;

import static android.view.flags.Flags.FLAG_WM_DISPLAY_REFRESH_RATE_TEST;

import static android.view.View.STATUS_BAR_DISABLE_BACK;

import static android.view.View.STATUS_BAR_DISABLE_BACK;

import static android.view.View.STATUS_BAR_DISABLE_CLOCK;

import static android.view.View.STATUS_BAR_DISABLE_CLOCK;

import static android.view.View.STATUS_BAR_DISABLE_EXPAND;

import static android.view.View.STATUS_BAR_DISABLE_EXPAND;
@@ -3907,7 +3906,7 @@ public interface WindowManager extends ViewManager { 
         * This value is ignored if {@link #preferredDisplayModeId} is set.

         * This value is ignored if {@link #preferredDisplayModeId} is set.

         * @hide

         * @hide

         */

         */

        @FlaggedApi(FLAG_WM_DISPLAY_REFRESH_RATE_TEST)

        @SuppressLint("UnflaggedApi") // @TestApi without associated feature.

        @TestApi

        @TestApi

        public float preferredMinDisplayRefreshRate;

        public float preferredMinDisplayRefreshRate;
@@ -3917,7 +3916,7 @@ public interface WindowManager extends ViewManager { 
         * This value is ignored if {@link #preferredDisplayModeId} is set.

         * This value is ignored if {@link #preferredDisplayModeId} is set.

         * @hide

         * @hide

         */

         */

        @FlaggedApi(FLAG_WM_DISPLAY_REFRESH_RATE_TEST)

        @SuppressLint("UnflaggedApi") // @TestApi without associated feature.

        @TestApi

        @TestApi

        public float preferredMaxDisplayRefreshRate;

        public float preferredMaxDisplayRefreshRate;

core/java/android/view/flags/refresh_rate_flags.aconfig

+0 −7
Original line number Original line Diff line number Diff line
@@ -43,10 +43,3 @@ flag { 
  description: "Enable the `setFrameRate` callback"

  description: "Enable the `setFrameRate` callback"

  bug: "299946220"

  bug: "299946220"

}
 
}
 


flag {

    name: "wm_display_refresh_rate_test"

    namespace: "core_graphics"

    description: "Adds WindowManager display refresh rate fields to test API"

    bug: "304475199"

}
 
 No newline at end of file