From fe4bf7926ed91661a39a08fabfc0eb55e2fb4f32 Mon Sep 17 00:00:00 2001 From: Sterling Huber Date: Thu, 7 Nov 2019 11:04:03 -0800 Subject: [PATCH] RESTRICT AUTOMERGE Make toasts non-clickable Since enforcement was only on client-side, in Toast class, an app could use reflection (or other means) to make the Toast clickable. This is a security vulnerability since it allows tapjacking, that is, intercept touch events and do stuff like steal PINs and passwords. This CL brings the enforcement to the system by applying flag FLAG_NOT_TOUCHABLE. Test: Construct app that uses reflection to remove flag FLAG_NOT_TOUCHABLE and log click events. Then: 1) Observe click events are logged without this CL. 2) Observer click events are not logged with this CL. Bug: 128674520 Change-Id: Ica346c853dcb9a1e494f7143ba1c38d22c0003d0 Merged In: Ica346c853dcb9a1e494f7143ba1c38d22c0003d0 --- .../core/java/com/android/server/policy/PhoneWindowManager.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/services/core/java/com/android/server/policy/PhoneWindowManager.java b/services/core/java/com/android/server/policy/PhoneWindowManager.java index e51c8deb43563..26d6c3dfdb6e8 100644 --- a/services/core/java/com/android/server/policy/PhoneWindowManager.java +++ b/services/core/java/com/android/server/policy/PhoneWindowManager.java @@ -2613,6 +2613,8 @@ public class PhoneWindowManager implements WindowManagerPolicy { attrs.hideTimeoutMilliseconds = TOAST_WINDOW_TIMEOUT; } attrs.windowAnimations = com.android.internal.R.style.Animation_Toast; + // Toasts can't be clickable + attrs.flags |= WindowManager.LayoutParams.FLAG_NOT_TOUCHABLE; break; }