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

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

Merge "Add FlaggedApi annotation for replaceContentOnDisplay test Apis" into main

parents 8679bfdf 690717aa

core/api/test-current.txt

+2 −2
Original line number Diff line number Diff line
@@ -3567,8 +3567,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 @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 @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 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 −0
Original line number Diff line number Diff line
@@ -82,6 +82,7 @@ import static android.view.WindowLayoutParamsProto.Y; 


import android.Manifest.permission;

import android.annotation.CallbackExecutor;

import android.annotation.FlaggedApi;

import android.annotation.IntDef;

import android.annotation.IntRange;

import android.annotation.NonNull;
@@ -5821,6 +5822,7 @@ public interface WindowManager extends ViewManager { 
     *

     * @hide

     */

    @FlaggedApi("REPLACE_CONTENT_WITH_MIRROR")

    @TestApi

    @RequiresPermission(permission.ACCESS_SURFACE_FLINGER)

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

     * @hide

     */

    @FlaggedApi("REPLACE_CONTENT_WITH_MIRROR")

    @TestApi

    @RequiresPermission(permission.ACCESS_SURFACE_FLINGER)

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