Merge "Drop input for toast and child surfaces" into sc-v2-dev am: fd48bc503c am: 6b4d48b624 (a5625411) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/wm/DisplayPolicy.java

+15 −0

Original line number	Diff line number	Diff line
		@@ -115,6 +115,7 @@ import android.graphics.Insets;
		import android.graphics.PixelFormat;
		import android.graphics.Rect;
		import android.graphics.Region;
		import android.gui.DropInputMode;
		import android.hardware.power.Boost;
		import android.os.Handler;
		import android.os.IBinder;
		@@ -961,6 +962,20 @@ public class DisplayPolicy {
		attrs.flags = sanitizeFlagSlippery(attrs.flags, attrs.privateFlags, win.getName());
		}

		/**
		* Add additional policy if needed to ensure the window or its children should not receive any
		* input.
		*/
		public void setDropInputModePolicy(WindowState win, LayoutParams attrs) {
		if (attrs.type == TYPE_TOAST
		&& (attrs.privateFlags & PRIVATE_FLAG_TRUSTED_OVERLAY) == 0) {
		// Toasts should not receive input. These windows should not have any children, so
		// force this hierarchy of windows to drop all input.
		mService.mTransactionFactory.get()
		.setDropInputMode(win.getSurfaceControl(), DropInputMode.ALL).apply();
		}
		}

		/**
		* Check if a window can be added to the system.
		*

+1 −0

Original line number	Diff line number	Diff line
		@@ -1783,6 +1783,7 @@ public class WindowManagerService extends IWindowManager.Stub

		win.mToken.addWindow(win);
		displayPolicy.addWindowLw(win, attrs);
		displayPolicy.setDropInputModePolicy(win, win.mAttrs);
		if (type == TYPE_APPLICATION_STARTING && activity != null) {
		activity.attachStartingWindow(win);
		ProtoLog.v(WM_DEBUG_STARTING_WINDOW, "addWindow: %s startingWindow=%s",