Merge "Merge "Inform SurfaceFlinger of which Surface is the RoundedCorners overlay." into oc-dr1-dev am: 48ed8aa4d0 am: e64d0028ae" into oc-mr1-dev-plus-aosp

am: eee9fe304c

Change-Id: Ibacf967f6dbf5a03752186e0a4c8750cabf15cae

core/java/android/view/SurfaceControl.java

@@ -271,6 +271,15 @@ public class SurfaceControl {
      */
     public static final int POWER_MODE_DOZE_SUSPEND = 3;
 
+    /**
+     * A value for windowType used to indicate that the window should be omitted from screenshots
+     * and display mirroring. A temporary workaround until we express such things with
+     * the hierarchy.
+     * TODO: b/64227542
+     * @hide
+     */
+    public static final int WINDOW_TYPE_DONT_SCREENSHOT = 441731;
+
     /**
      * Create a surface with a name.
      * <p>

core/java/android/view/WindowManager.java

@@ -1413,11 +1413,12 @@ public interface WindowManager extends ViewManager {
         public static final int PRIVATE_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS = 0x00080000;
 
         /**
-         * Flag to indicate that this window should be ignored when determining what parts of the
-         * screen can be magnified.
+         * Indicates that this window is the rounded corners overlay present on some
+         * devices this means that it will be excluded from: screenshots,
+         * screen magnification, and mirroring.
          * @hide
          */
-        public static final int PRIVATE_FLAG_NO_MAGNIFICATION_REGION_EFFECT = 0x00100000;
+        public static final int PRIVATE_FLAG_IS_ROUNDED_CORNERS_OVERLAY = 0x00100000;
 
         /**
          * Control flags that are private to the platform.