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

Commit 27b486ff authored by Chavi Weingarten's avatar Chavi Weingarten Committed by Android (Google) Code Review
Browse files

Merge "SuppressLint for TestApis" into main

parents 904d7394 937a0629

core/api/test-current.txt

+2 −2
Original line number Diff line number Diff line
@@ -3573,8 +3573,8 @@ package android.view { 
    method public default void holdLock(android.os.IBinder, int);

    method public default boolean isGlobalKey(int);

    method public default boolean isTaskSnapshotSupported();

    method @FlaggedApi("REPLACE_CONTENT_WITH_MIRROR") @RequiresPermission(android.Manifest.permission.ACCESS_SURFACE_FLINGER) public default boolean replaceContentOnDisplayWithMirror(int, @NonNull android.view.Window);

    method @FlaggedApi("REPLACE_CONTENT_WITH_MIRROR") @RequiresPermission(android.Manifest.permission.ACCESS_SURFACE_FLINGER) public default boolean replaceContentOnDisplayWithSc(int, @NonNull android.view.SurfaceControl);

    method @RequiresPermission(android.Manifest.permission.ACCESS_SURFACE_FLINGER) public default boolean replaceContentOnDisplayWithMirror(int, @NonNull android.view.Window);

    method @RequiresPermission(android.Manifest.permission.ACCESS_SURFACE_FLINGER) public default boolean replaceContentOnDisplayWithSc(int, @NonNull android.view.SurfaceControl);

    method public default void setDisplayImePolicy(int, int);

    method public default void setShouldShowSystemDecors(int, boolean);

    method public default void setShouldShowWithInsecureKeyguard(int, boolean);

core/java/android/view/WindowManager.java

+3 −2
Original line number Diff line number Diff line
@@ -90,6 +90,7 @@ import android.annotation.IntRange; 
import android.annotation.NonNull;

import android.annotation.Nullable;

import android.annotation.RequiresPermission;

import android.annotation.SuppressLint;

import android.annotation.SystemApi;

import android.annotation.SystemService;

import android.annotation.TestApi;
@@ -5872,7 +5873,7 @@ public interface WindowManager extends ViewManager { 
     *

     * @hide

     */

    @FlaggedApi("REPLACE_CONTENT_WITH_MIRROR")

    @SuppressLint("UnflaggedApi") // The API is only used for tests.

    @TestApi

    @RequiresPermission(permission.ACCESS_SURFACE_FLINGER)

    default boolean replaceContentOnDisplayWithMirror(int displayId, @NonNull Window window) {
@@ -5888,7 +5889,7 @@ public interface WindowManager extends ViewManager { 
     *

     * @hide

     */

    @FlaggedApi("REPLACE_CONTENT_WITH_MIRROR")

    @SuppressLint("UnflaggedApi") // The API is only used for tests.

    @TestApi

    @RequiresPermission(permission.ACCESS_SURFACE_FLINGER)

    default boolean replaceContentOnDisplayWithSc(int displayId, @NonNull SurfaceControl sc) {