Show error dialogs over apps that dismiss keyguard (2b9e9f41) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/input/InputWindowHandle.java

+0 −1

Original line number	Diff line number	Diff line
		@@ -44,7 +44,6 @@ public final class InputWindowHandle {

		// Window layout params attributes. (WindowManager.LayoutParams)
		public int layoutParamsFlags;
		public int layoutParamsPrivateFlags;
		public int layoutParamsType;

		// Dispatching timeout.

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

+0 −1

Original line number	Diff line number	Diff line
		@@ -114,7 +114,6 @@ class DragState {
		mDragWindowHandle.inputChannel = mServerChannel;
		mDragWindowHandle.layer = getDragLayerLw();
		mDragWindowHandle.layoutParamsFlags = 0;
		mDragWindowHandle.layoutParamsPrivateFlags = 0;
		mDragWindowHandle.layoutParamsType = WindowManager.LayoutParams.TYPE_DRAG;
		mDragWindowHandle.dispatchingTimeoutNanos =
		WindowManagerService.DEFAULT_INPUT_DISPATCHING_TIMEOUT_NANOS;

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

+1 −2

Original line number	Diff line number	Diff line
		@@ -38,7 +38,7 @@ public final class FakeWindowImpl implements WindowManagerPolicy.FakeWindow {

		public FakeWindowImpl(WindowManagerService service,
		Looper looper, InputEventReceiver.Factory inputEventReceiverFactory,
		String name, int windowType, int layoutParamsFlags, int layoutParamsPrivateFlags,
		String name, int windowType, int layoutParamsFlags,
		boolean canReceiveKeys, boolean hasFocus, boolean touchFullscreen) {
		mService = service;

		@@ -61,7 +61,6 @@ public final class FakeWindowImpl implements WindowManagerPolicy.FakeWindow {
		mWindowLayer = getLayerLw(windowType);
		mWindowHandle.layer = mWindowLayer;
		mWindowHandle.layoutParamsFlags = layoutParamsFlags;
		mWindowHandle.layoutParamsPrivateFlags = layoutParamsPrivateFlags;
		mWindowHandle.layoutParamsType = windowType;
		mWindowHandle.dispatchingTimeoutNanos =
		WindowManagerService.DEFAULT_INPUT_DISPATCHING_TIMEOUT_NANOS;

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

+5 −7

Original line number	Diff line number	Diff line
		@@ -168,8 +168,8 @@ final class InputMonitor implements InputManagerService.WindowManagerCallbacks {
		}

		private void addInputWindowHandleLw(final InputWindowHandle inputWindowHandle,
		final WindowState child, int flags, int privateFlags, final int type,
		final boolean isVisible, final boolean hasFocus, final boolean hasWallpaper) {
		final WindowState child, int flags, final int type, final boolean isVisible,
		final boolean hasFocus, final boolean hasWallpaper) {
		// Add a window to our list of input windows.
		inputWindowHandle.name = child.toString();
		final boolean modal = (flags & (WindowManager.LayoutParams.FLAG_NOT_TOUCH_MODAL
		@@ -184,7 +184,6 @@ final class InputMonitor implements InputManagerService.WindowManagerCallbacks {
		child.getTouchableRegion(inputWindowHandle.touchableRegion);
		}
		inputWindowHandle.layoutParamsFlags = flags;
		inputWindowHandle.layoutParamsPrivateFlags = privateFlags;
		inputWindowHandle.layoutParamsType = type;
		inputWindowHandle.dispatchingTimeoutNanos = child.getInputDispatchingTimeoutNanos();
		inputWindowHandle.visible = isVisible;
		@@ -298,15 +297,14 @@ final class InputMonitor implements InputManagerService.WindowManagerCallbacks {
		final WindowState u = universeBackground.mWin;
		if (u.mInputChannel != null && u.mInputWindowHandle != null) {
		addInputWindowHandleLw(u.mInputWindowHandle, u, u.mAttrs.flags,
		u.mAttrs.privateFlags, u.mAttrs.type,
		true, u == mInputFocus, false);
		u.mAttrs.type, true, u == mInputFocus, false);
		}
		addedUniverse = true;
		}

		if (child.mWinAnimator != universeBackground) {
		addInputWindowHandleLw(inputWindowHandle, child, flags, privateFlags, type,
		isVisible, hasFocus, hasWallpaper);
		addInputWindowHandleLw(inputWindowHandle, child, flags, type, isVisible,
		hasFocus, hasWallpaper);
		}
		}
		}

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

+4 −1

Original line number	Diff line number	Diff line
		@@ -20,6 +20,7 @@ import static android.view.WindowManager.LayoutParams.FLAG_SHOW_WALLPAPER;
		import static android.view.WindowManager.LayoutParams.FLAG_SHOW_WHEN_LOCKED;

		import static android.view.WindowManager.LayoutParams.PRIVATE_FLAG_KEYGUARD;
		import static android.view.WindowManager.LayoutParams.PRIVATE_FLAG_SYSTEM_ERROR;
		import static com.android.server.wm.WindowManagerService.DEBUG_KEYGUARD;
		import static com.android.server.wm.WindowManagerService.LayoutFields.SET_UPDATE_ROTATION;
		import static com.android.server.wm.WindowManagerService.LayoutFields.SET_WALLPAPER_MAY_CHANGE;
		@@ -330,7 +331,9 @@ public class WindowAnimator {
		+ " anim=" + win.mWinAnimator.mAnimation);
		} else if (mPolicy.canBeForceHidden(win, win.mAttrs)) {
		final boolean hideWhenLocked = !((win.mIsImWindow && showImeOverKeyguard) \|\|
		(appShowWhenLocked != null && appShowWhenLocked == win.mAppToken));
		(appShowWhenLocked != null && (appShowWhenLocked == win.mAppToken \|\|
		// Show error dialogs over apps that dismiss keyguard.
		(win.mAttrs.privateFlags & PRIVATE_FLAG_SYSTEM_ERROR) != 0)));
		if (((mForceHiding == KEYGUARD_ANIMATING_IN)
		&& (!winAnimator.isAnimating() \|\| hideWhenLocked))
		\|\| ((mForceHiding == KEYGUARD_SHOWN) && hideWhenLocked)) {