Merge "RESTRICT AUTOMERGE Make toasts non-clickable" into qt-dev

2019-12-13 16:44:14 +00:00
parent e8ba34a851 b81f269ae2
commit 1e53d56481
1 changed files with 2 additions and 0 deletions
--- a/services/core/java/com/android/server/wm/DisplayPolicy.java
+++ b/services/core/java/com/android/server/wm/DisplayPolicy.java
@@ -857,6 +857,8 @@ public class DisplayPolicy {
                if (canToastShowWhenLocked(callingPid)) {
                    attrs.flags |= WindowManager.LayoutParams.FLAG_SHOW_WHEN_LOCKED;
                }
+                // Toasts can't be clickable
+                attrs.flags |= WindowManager.LayoutParams.FLAG_NOT_TOUCHABLE;
                break;
        }