Merge "Check instrumentation source UID in setInstrumenting" into tm-dev am: 5715750e57 (5794192d) · Commits · e / os / android_frameworks_base

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

+8 −3

Original line number	Diff line number	Diff line
		@@ -5303,14 +5303,19 @@ public class ActivityTaskManagerService extends IActivityTaskManager.Stub {

		/**
		* Returns {@code true} if the process represented by the pid passed as argument is
		* instrumented.
		* instrumented and the instrumentation source was granted with the permission also
		* passed as argument.
		*/
		boolean isInstrumenting(int pid) {
		boolean instrumentationSourceHasPermission(int pid, String permission) {
		final WindowProcessController process;
		synchronized (mGlobalLock) {
		process = mProcessMap.getProcess(pid);
		}
		return process != null ? process.isInstrumenting() : false;
		if (process == null \|\| !process.isInstrumenting()) {
		return false;
		}
		final int sourceUid = process.getInstrumentationSourceUid();
		return checkPermission(permission, -1, sourceUid) == PackageManager.PERMISSION_GRANTED;
		}

		final class H extends Handler {

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

+5 −4

Original line number	Diff line number	Diff line
		@@ -3760,7 +3760,8 @@ public class WindowManagerService extends IWindowManager.Stub
		* Sets the touch mode state.
		*
		* To be able to change touch mode state, the caller must either own the focused window, or must
		* have the MODIFY_TOUCH_MODE_STATE permission. Instrumented processes are allowed to switch
		* have the {@link android.Manifest.permission#MODIFY_TOUCH_MODE_STATE} permission. Instrumented
		* process, sourced with {@link android.Manifest.permission#MODIFY_TOUCH_MODE_STATE}, may switch
		* touch mode at any time.
		*
		* @param mode the touch mode to set
		@@ -3773,8 +3774,8 @@ public class WindowManagerService extends IWindowManager.Stub
		}
		final int pid = Binder.getCallingPid();
		final int uid = Binder.getCallingUid();

		final boolean hasPermission = mAtmService.isInstrumenting(pid)
		final boolean hasPermission =
		mAtmService.instrumentationSourceHasPermission(pid, MODIFY_TOUCH_MODE_STATE)
		\|\| checkCallingPermission(MODIFY_TOUCH_MODE_STATE, "setInTouchMode()");
		final long token = Binder.clearCallingIdentity();
		try {

services/tests/wmtests/src/com/android/server/wm/WindowManagerServiceTests.java

+7 −4

Original line number	Diff line number	Diff line
		@@ -266,7 +266,8 @@ public class WindowManagerServiceTests extends WindowTestsBase {
		final WindowToken windowToken = createTestWindowToken(TYPE_INPUT_METHOD, mDefaultDisplay);
		final Session session = new Session(mWm, new IWindowSessionCallback.Stub() {
		@Override
		public void onAnimatorScaleChanged(float v) throws RemoteException {}
		public void onAnimatorScaleChanged(float v) throws RemoteException {
		}
		});
		final WindowManager.LayoutParams params = new WindowManager.LayoutParams(
		TYPE_APPLICATION_ATTACHED_DIALOG);
		@@ -292,7 +293,8 @@ public class WindowManagerServiceTests extends WindowTestsBase {
		int callingPid = Binder.getCallingPid();
		int callingUid = Binder.getCallingUid();
		doReturn(false).when(mWm).checkCallingPermission(anyString(), anyString());
		when(mWm.mAtmService.isInstrumenting(callingPid)).thenReturn(true);
		when(mWm.mAtmService.instrumentationSourceHasPermission(callingPid,
		android.Manifest.permission.MODIFY_TOUCH_MODE_STATE)).thenReturn(true);

		mWm.setInTouchMode(!currentTouchMode);

		@@ -306,7 +308,8 @@ public class WindowManagerServiceTests extends WindowTestsBase {
		int callingPid = Binder.getCallingPid();
		int callingUid = Binder.getCallingUid();
		doReturn(false).when(mWm).checkCallingPermission(anyString(), anyString());
		when(mWm.mAtmService.isInstrumenting(callingPid)).thenReturn(false);
		when(mWm.mAtmService.instrumentationSourceHasPermission(callingPid,
		android.Manifest.permission.MODIFY_TOUCH_MODE_STATE)).thenReturn(false);

		mWm.setInTouchMode(!currentTouchMode);