Merge tag 'android-7.1.2_r36' into nougat-x86

[android-x86/frameworks-base.git] / services / core / java / com / android / server / wm / WindowState.java

diff --git a/services/core/java/com/android/server/wm/WindowState.java b/services/core/java/com/android/server/wm/WindowState.java
index 228ef1a..c0dd8da 100644 (file)
--- a/services/core/java/com/android/server/wm/WindowState.java
+++ b/services/core/java/com/android/server/wm/WindowState.java
@@ -1689,7 +1689,7 @@ final class WindowState implements WindowManagerPolicy.WindowState {
 
     int getTouchableRegion(Region region, int flags) {
         final boolean modal = (flags & (FLAG_NOT_TOUCH_MODAL | FLAG_NOT_FOCUSABLE)) == 0;
-        if (modal && mAppToken != null) {
+        if (modal && mAppToken != null && !mAppToken.appFullscreen) {
             // Limit the outer touch to the activity stack region.
             flags |= FLAG_NOT_TOUCH_MODAL;
             // If this is a modal window we need to dismiss it if it's not full screen and the