Merge "Ultrasound: Fix off-screen display window frame size overwrite" (0b842915) · Commits · e / os / android_frameworks_base

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

+5 −3

Original line number	Diff line number	Diff line
		@@ -182,6 +182,8 @@ final class InputMonitor implements InputManagerService.WindowManagerCallbacks {
		DisplayContent offScreenDisplayContent =
		mService.getDigitalPenOffScreenDisplayContentLocked();

		Rect touchableRegion = new Rect();

		if ((!DigitalPenOffScreenDisplayAdapter.isDigitalPenDisabled())
		&& (null != offScreenDisplayContent)
		&& (child.getDisplayId() == offScreenDisplayContent.getDisplayId())) {
		@@ -189,11 +191,11 @@ final class InputMonitor implements InputManagerService.WindowManagerCallbacks {
		// display, make the touchable region the entire frame. Using
		// getStackBounds() will yield the bounds of the activity which
		// is on the main display - not what we want.
		mTmpRect = child.getFrameLw();
		touchableRegion = child.getFrameLw();
		} else {
		child.getStackBounds(mTmpRect);
		child.getStackBounds(touchableRegion);
		}
		inputWindowHandle.touchableRegion.set(mTmpRect);
		inputWindowHandle.touchableRegion.set(touchableRegion);
		} else {
		// Not modal or full screen modal
		child.getTouchableRegion(inputWindowHandle.touchableRegion);