Merge "Fix sysui's security issue of cross-user copy/paste" into qt-dev (644bc384) · Commits · e / os / android_frameworks_base

core/java/android/content/ClipboardManager.java

+11 −8

Original line number	Diff line number	Diff line
		@@ -103,7 +103,7 @@ public class ClipboardManager extends android.text.ClipboardManager {
		try {
		Preconditions.checkNotNull(clip);
		clip.prepareToLeaveProcess(true);
		mService.setPrimaryClip(clip, mContext.getOpPackageName());
		mService.setPrimaryClip(clip, mContext.getOpPackageName(), mContext.getUserId());
		} catch (RemoteException e) {
		throw e.rethrowFromSystemServer();
		}
		@@ -116,7 +116,7 @@ public class ClipboardManager extends android.text.ClipboardManager {
		*/
		public void clearPrimaryClip() {
		try {
		mService.clearPrimaryClip(mContext.getOpPackageName());
		mService.clearPrimaryClip(mContext.getOpPackageName(), mContext.getUserId());
		} catch (RemoteException e) {
		throw e.rethrowFromSystemServer();
		}
		@@ -132,7 +132,7 @@ public class ClipboardManager extends android.text.ClipboardManager {
		*/
		public @Nullable ClipData getPrimaryClip() {
		try {
		return mService.getPrimaryClip(mContext.getOpPackageName());
		return mService.getPrimaryClip(mContext.getOpPackageName(), mContext.getUserId());
		} catch (RemoteException e) {
		throw e.rethrowFromSystemServer();
		}
		@@ -149,7 +149,8 @@ public class ClipboardManager extends android.text.ClipboardManager {
		*/
		public @Nullable ClipDescription getPrimaryClipDescription() {
		try {
		return mService.getPrimaryClipDescription(mContext.getOpPackageName());
		return mService.getPrimaryClipDescription(mContext.getOpPackageName(),
		mContext.getUserId());
		} catch (RemoteException e) {
		throw e.rethrowFromSystemServer();
		}
		@@ -163,7 +164,7 @@ public class ClipboardManager extends android.text.ClipboardManager {
		*/
		public boolean hasPrimaryClip() {
		try {
		return mService.hasPrimaryClip(mContext.getOpPackageName());
		return mService.hasPrimaryClip(mContext.getOpPackageName(), mContext.getUserId());
		} catch (RemoteException e) {
		throw e.rethrowFromSystemServer();
		}
		@@ -174,7 +175,8 @@ public class ClipboardManager extends android.text.ClipboardManager {
		if (mPrimaryClipChangedListeners.isEmpty()) {
		try {
		mService.addPrimaryClipChangedListener(
		mPrimaryClipChangedServiceListener, mContext.getOpPackageName());
		mPrimaryClipChangedServiceListener, mContext.getOpPackageName(),
		mContext.getUserId());
		} catch (RemoteException e) {
		throw e.rethrowFromSystemServer();
		}
		@@ -189,7 +191,8 @@ public class ClipboardManager extends android.text.ClipboardManager {
		if (mPrimaryClipChangedListeners.isEmpty()) {
		try {
		mService.removePrimaryClipChangedListener(
		mPrimaryClipChangedServiceListener);
		mPrimaryClipChangedServiceListener, mContext.getOpPackageName(),
		mContext.getUserId());
		} catch (RemoteException e) {
		throw e.rethrowFromSystemServer();
		}
		@@ -226,7 +229,7 @@ public class ClipboardManager extends android.text.ClipboardManager {
		@Deprecated
		public boolean hasText() {
		try {
		return mService.hasClipboardText(mContext.getOpPackageName());
		return mService.hasClipboardText(mContext.getOpPackageName(), mContext.getUserId());
		} catch (RemoteException e) {
		throw e.rethrowFromSystemServer();
		}

core/java/android/content/IClipboard.aidl

+9 −8

Original line number	Diff line number	Diff line
		@@ -26,17 +26,18 @@ import android.content.IOnPrimaryClipChangedListener;
		* {@hide}
		*/
		interface IClipboard {
		void setPrimaryClip(in ClipData clip, String callingPackage);
		void clearPrimaryClip(String callingPackage);
		ClipData getPrimaryClip(String pkg);
		ClipDescription getPrimaryClipDescription(String callingPackage);
		boolean hasPrimaryClip(String callingPackage);
		void setPrimaryClip(in ClipData clip, String callingPackage, int userId);
		void clearPrimaryClip(String callingPackage, int userId);
		ClipData getPrimaryClip(String pkg, int userId);
		ClipDescription getPrimaryClipDescription(String callingPackage, int userId);
		boolean hasPrimaryClip(String callingPackage, int userId);
		void addPrimaryClipChangedListener(in IOnPrimaryClipChangedListener listener,
		String callingPackage);
		void removePrimaryClipChangedListener(in IOnPrimaryClipChangedListener listener);
		String callingPackage, int userId);
		void removePrimaryClipChangedListener(in IOnPrimaryClipChangedListener listener,
		String callingPackage, int userId);

		/**
		* Returns true if the clipboard contains text; false otherwise.
		*/
		boolean hasClipboardText(String callingPackage);
		boolean hasClipboardText(String callingPackage, int userId);
		}

core/java/android/widget/TextView.java

+18 −13

Original line number	Diff line number	Diff line
		@@ -11244,13 +11244,23 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener

		@Nullable
		final TextServicesManager getTextServicesManagerForUser() {
		return getServiceManagerForUser("android", TextServicesManager.class);
		}

		@Nullable
		final ClipboardManager getClipboardManagerForUser() {
		return getServiceManagerForUser(getContext().getPackageName(), ClipboardManager.class);
		}

		@Nullable
		final <T> T getServiceManagerForUser(String packageName, Class<T> managerClazz) {
		if (mTextOperationUser == null) {
		return getContext().getSystemService(TextServicesManager.class);
		return getContext().getSystemService(managerClazz);
		}
		try {
		return getContext().createPackageContextAsUser(
		"android", 0 /* flags */, mTextOperationUser)
		.getSystemService(TextServicesManager.class);
		Context context = getContext().createPackageContextAsUser(
		packageName, 0 /* flags */, mTextOperationUser);
		return context.getSystemService(managerClazz);
		} catch (PackageManager.NameNotFoundException e) {
		return null;
		}
		@@ -12540,8 +12550,7 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener
		&& mEditor != null && mEditor.mKeyListener != null
		&& getSelectionStart() >= 0
		&& getSelectionEnd() >= 0
		&& ((ClipboardManager) getContext().getSystemService(Context.CLIPBOARD_SERVICE))
		.hasPrimaryClip());
		&& getClipboardManagerForUser().hasPrimaryClip());
		}

		boolean canPasteAsPlainText() {
		@@ -12549,9 +12558,7 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener
		return false;
		}

		final ClipData clipData =
		((ClipboardManager) getContext().getSystemService(Context.CLIPBOARD_SERVICE))
		.getPrimaryClip();
		final ClipData clipData = getClipboardManagerForUser().getPrimaryClip();
		final ClipDescription description = clipData.getDescription();
		final boolean isPlainType = description.hasMimeType(ClipDescription.MIMETYPE_TEXT_PLAIN);
		final CharSequence text = clipData.getItemAt(0).getText();
		@@ -12594,8 +12601,7 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener
		* Paste clipboard content between min and max positions.
		*/
		private void paste(int min, int max, boolean withFormatting) {
		ClipboardManager clipboard =
		(ClipboardManager) getContext().getSystemService(Context.CLIPBOARD_SERVICE);
		ClipboardManager clipboard = getClipboardManagerForUser();
		ClipData clip = clipboard.getPrimaryClip();
		if (clip != null) {
		boolean didFirst = false;
		@@ -12638,8 +12644,7 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener

		@CheckResult
		private boolean setPrimaryClip(ClipData clip) {
		ClipboardManager clipboard =
		(ClipboardManager) getContext().getSystemService(Context.CLIPBOARD_SERVICE);
		ClipboardManager clipboard = getClipboardManagerForUser();
		try {
		clipboard.setPrimaryClip(clip);
		} catch (Throwable t) {