Merge "Set the IME to secure if the target is secure" into sc-dev (96f0dd18) · Commits · e / os / android_frameworks_base

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

+5 −1

Original line number	Original line	Diff line number	Diff line
	@@ -3750,6 +3750,10 @@ class DisplayContent extends RootDisplayArea implements WindowManagerPolicy.Disp
	@VisibleForTesting		@VisibleForTesting
	void setImeInputTarget(WindowState target) {		void setImeInputTarget(WindowState target) {
	mImeInputTarget = target;		mImeInputTarget = target;
			boolean canScreenshot = mImeInputTarget == null \|\| !mImeInputTarget.isSecureLocked();
			if (mImeWindowsContainer.setCanScreenshot(canScreenshot)) {
			mWmService.requestTraversal();
			}
	}		}

	@VisibleForTesting		@VisibleForTesting
	@@ -3867,7 +3871,7 @@ class DisplayContent extends RootDisplayArea implements WindowManagerPolicy.Disp
	void updateImeInputAndControlTarget(WindowState target) {		void updateImeInputAndControlTarget(WindowState target) {
	if (mImeInputTarget != target) {		if (mImeInputTarget != target) {
	ProtoLog.i(WM_DEBUG_IME, "setInputMethodInputTarget %s", target);		ProtoLog.i(WM_DEBUG_IME, "setInputMethodInputTarget %s", target);
	mImeInputTarget = target;		setImeInputTarget(target);
	updateImeControlTarget();		updateImeControlTarget();
	}		}
	}		}

+8 −0

Original line number	Original line	Diff line number	Diff line
	@@ -3321,4 +3321,12 @@ class WindowContainer<E extends WindowContainer> extends ConfigurationContainer<
	@WindowManager.LayoutParams.WindowType int getWindowType() {		@WindowManager.LayoutParams.WindowType int getWindowType() {
	return INVALID_WINDOW_TYPE;		return INVALID_WINDOW_TYPE;
	}		}

			boolean setCanScreenshot(boolean canScreenshot) {
			if (mSurfaceControl == null) {
			return false;
			}
			getPendingTransaction().setSecure(mSurfaceControl, !canScreenshot);
			return true;
			}
	}		}