Merge "Don't allow enabling system decorations for untrusted virtual displays... (8e2bba35) · Commits · e / os / android_frameworks_base

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

+8 −0

Original line number	Diff line number	Diff line
		@@ -6963,6 +6963,10 @@ public class WindowManagerService extends IWindowManager.Stub
		+ "not exist: " + displayId);
		return;
		}
		if (displayContent.isUntrustedVirtualDisplay()) {
		throw new SecurityException("Attempted to set system decors flag to an untrusted "
		+ "virtual display: " + displayId);
		}

		mDisplayWindowSettings.setShouldShowSystemDecorsLocked(displayContent, shouldShow);

		@@ -7004,6 +7008,10 @@ public class WindowManagerService extends IWindowManager.Stub
		+ displayId);
		return;
		}
		if (displayContent.isUntrustedVirtualDisplay()) {
		throw new SecurityException("Attempted to set IME flag to an untrusted "
		+ "virtual display: " + displayId);
		}

		mDisplayWindowSettings.setShouldShowImeLocked(displayContent, shouldShow);