Merge "Support addWindow as other user" into rvc-dev am: 1a46294fdb (aca2cebd) · Commits · e / os / android_frameworks_base

core/java/android/view/IWindowSession.aidl

+5 −0

Original line number	Diff line number	Diff line
		@@ -48,6 +48,11 @@ interface IWindowSession {
		out Rect outContentInsets, out Rect outStableInsets,
		out DisplayCutout.ParcelableWrapper displayCutout, out InputChannel outInputChannel,
		out InsetsState insetsState, out InsetsSourceControl[] activeControls);
		int addToDisplayAsUser(IWindow window, int seq, in WindowManager.LayoutParams attrs,
		in int viewVisibility, in int layerStackId, in int userId,
		out Rect outFrame, out Rect outContentInsets, out Rect outStableInsets,
		out DisplayCutout.ParcelableWrapper displayCutout, out InputChannel outInputChannel,
		out InsetsState insetsState, out InsetsSourceControl[] activeControls);
		int addToDisplayWithoutInputChannel(IWindow window, int seq, in WindowManager.LayoutParams attrs,
		in int viewVisibility, in int layerStackId, out Rect outContentInsets,
		out Rect outStableInsets, out InsetsState insetsState);

core/java/android/view/ViewRootImpl.java

+14 −2

Original line number	Diff line number	Diff line
		@@ -111,6 +111,7 @@ import android.os.RemoteException;
		import android.os.SystemClock;
		import android.os.SystemProperties;
		import android.os.Trace;
		import android.os.UserHandle;
		import android.sysprop.DisplayProperties;
		import android.util.AndroidRuntimeException;
		import android.util.DisplayMetrics;
		@@ -893,6 +894,14 @@ public final class ViewRootImpl implements ViewParent,
		* We have one child
		*/
		public void setView(View view, WindowManager.LayoutParams attrs, View panelParentView) {
		setView(view, attrs, panelParentView, UserHandle.myUserId());
		}

		/**
		* We have one child
		*/
		public void setView(View view, WindowManager.LayoutParams attrs, View panelParentView,
		int userId) {
		synchronized (this) {
		if (mView == null) {
		mView = view;
		@@ -1001,8 +1010,8 @@ public final class ViewRootImpl implements ViewParent,
		mAttachInfo.mRecomputeGlobalAttributes = true;
		collectViewAttributes();
		adjustLayoutParamsForCompatibility(mWindowAttributes);
		res = mWindowSession.addToDisplay(mWindow, mSeq, mWindowAttributes,
		getHostVisibility(), mDisplay.getDisplayId(), mTmpFrame,
		res = mWindowSession.addToDisplayAsUser(mWindow, mSeq, mWindowAttributes,
		getHostVisibility(), mDisplay.getDisplayId(), userId, mTmpFrame,
		mAttachInfo.mContentInsets, mAttachInfo.mStableInsets,
		mAttachInfo.mDisplayCutout, inputChannel,
		mTempInsets, mTempControls);
		@@ -1075,6 +1084,9 @@ public final class ViewRootImpl implements ViewParent,
		throw new WindowManager.InvalidDisplayException("Unable to add window "
		+ mWindow + " -- the specified window type "
		+ mWindowAttributes.type + " is not valid");
		case WindowManagerGlobal.ADD_INVALID_USER:
		throw new WindowManager.BadTokenException("Unable to add Window "
		+ mWindow + " -- requested userId is not valid");
		}
		throw new RuntimeException(
		"Unable to add window -- unknown error code " + res);

core/java/android/view/WindowManagerGlobal.java

+3 −2

Original line number	Diff line number	Diff line
		@@ -144,6 +144,7 @@ public final class WindowManagerGlobal {
		public static final int ADD_PERMISSION_DENIED = -8;
		public static final int ADD_INVALID_DISPLAY = -9;
		public static final int ADD_INVALID_TYPE = -10;
		public static final int ADD_INVALID_USER = -11;

		@UnsupportedAppUsage
		private static WindowManagerGlobal sDefaultWindowManager;
		@@ -325,7 +326,7 @@ public final class WindowManagerGlobal {
		}

		public void addView(View view, ViewGroup.LayoutParams params,
		Display display, Window parentWindow) {
		Display display, Window parentWindow, int userId) {
		if (view == null) {
		throw new IllegalArgumentException("view must not be null");
		}
		@@ -402,7 +403,7 @@ public final class WindowManagerGlobal {

		// do this last because it fires off messages to start doing things
		try {
		root.setView(view, wparams, panelParentView);
		root.setView(view, wparams, panelParentView, userId);
		} catch (RuntimeException e) {
		// BadTokenException or InvalidDisplayException, clean up.
		if (index >= 0) {

core/java/android/view/WindowManagerImpl.java

+2 −1

Original line number	Diff line number	Diff line
		@@ -104,7 +104,8 @@ public final class WindowManagerImpl implements WindowManager {
		@Override
		public void addView(@NonNull View view, @NonNull ViewGroup.LayoutParams params) {
		applyDefaultToken(params);
		mGlobal.addView(view, params, mContext.getDisplayNoVerify(), mParentWindow);
		mGlobal.addView(view, params, mContext.getDisplayNoVerify(), mParentWindow,
		mContext.getUserId());
		}

		@Override

core/java/android/view/WindowlessWindowManager.java

+14 −0

Original line number	Diff line number	Diff line
		@@ -130,6 +130,20 @@ public class WindowlessWindowManager implements IWindowSession {
		return WindowManagerGlobal.ADD_OKAY \| WindowManagerGlobal.ADD_FLAG_APP_VISIBLE;
		}

		/**
		* IWindowSession implementation. Currently this class doesn't need to support for multi-user.
		*/
		@Override
		public int addToDisplayAsUser(IWindow window, int seq, WindowManager.LayoutParams attrs,
		int viewVisibility, int displayId, int userId, Rect outFrame,
		Rect outContentInsets, Rect outStableInsets,
		DisplayCutout.ParcelableWrapper outDisplayCutout, InputChannel outInputChannel,
		InsetsState outInsetsState, InsetsSourceControl[] outActiveControls) {
		return addToDisplay(window, seq, attrs, viewVisibility, displayId,
		outFrame, outContentInsets, outStableInsets, outDisplayCutout, outInputChannel,
		outInsetsState, outActiveControls);
		}

		@Override
		public int addToDisplayWithoutInputChannel(android.view.IWindow window, int seq,
		android.view.WindowManager.LayoutParams attrs, int viewVisibility, int layerStackId,