diff options
| author | 2023-11-03 16:34:58 +0000 | |
|---|---|---|
| committer | 2023-11-03 16:34:58 +0000 | |
| commit | 27b486ff8e481c80349d93fd05451fac43d1aee6 (patch) | |
| tree | 943c8a368c1540de740ebb4c973e0cdd6b1e330c | |
| parent | 904d7394a6e425bf35646c2e43d5be85f14e2f43 (diff) | |
| parent | 937a06296655114f170cca4bc6740276e04d4b82 (diff) | |
Merge "SuppressLint for TestApis" into main
| -rw-r--r-- | core/api/test-current.txt | 4 | ||||
| -rw-r--r-- | core/java/android/view/WindowManager.java | 5 |
2 files changed, 5 insertions, 4 deletions
diff --git a/core/api/test-current.txt b/core/api/test-current.txt index b5468dc0aa97..258ff312259c 100644 --- a/core/api/test-current.txt +++ b/core/api/test-current.txt @@ -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); diff --git a/core/java/android/view/WindowManager.java b/core/java/android/view/WindowManager.java index 4f03ce98ccac..cfec08120776 100644 --- a/core/java/android/view/WindowManager.java +++ b/core/java/android/view/WindowManager.java @@ -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) { |