am 8117eda6: am 8c6b59f4: Merge "Add system api for disabling touch events in wallpaper behind the window." into lmp-mr1-dev

* commit '8117eda6f18a4d388a12ab0af318c95b86280084':
  Add system api for disabling touch events in wallpaper behind the window.

1 files changed, 9 insertions, 0 deletions

diff --git a/core/java/android/view/Window.java b/core/java/android/view/Window.java
index 6944c53b2bd7..55c6cb89c936 100644
--- a/core/java/android/view/Window.java
+++ b/core/java/android/view/Window.java
@@ -18,6 +18,7 @@ package android.view;
 
 import android.annotation.NonNull;
 import android.annotation.Nullable;
+import android.annotation.SystemApi;
 import android.content.Context;
 import android.content.res.Configuration;
 import android.content.res.Resources;
@@ -901,6 +902,14 @@ public abstract class Window {
     }
 
     /** @hide */
+    @SystemApi
+    public void setDisableWallpaperTouchEvents(boolean disable) {
+        setPrivateFlags(disable
+                ? WindowManager.LayoutParams.PRIVATE_FLAG_DISABLE_WALLPAPER_TOUCH_EVENTS : 0,
+                WindowManager.LayoutParams.PRIVATE_FLAG_DISABLE_WALLPAPER_TOUCH_EVENTS);
+    }
+
+    /** @hide */
     public abstract void alwaysReadCloseOnTouchAttr();
 
     /** @hide */