Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Check instrumentation source UID in setInstrumenting" into tm-dev

Browse Source
This commit is contained in:
Antonio Kantek
2022-03-22 03:33:16 +00:00
committed by Android (Google) Code Review
parent fe874818ca a5e0a4f770
commit 5715750e57
3 changed files with 20 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
services/core/java/com/android/server/wm/ActivityTaskManagerService.java
View File

@@ -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 {

9
services/core/java/com/android/server/wm/WindowManagerService.java
View File

@@ -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,9 +3774,9 @@ public class WindowManagerService extends IWindowManager.Stub
}
final int pid = Binder.getCallingPid();
final int uid = Binder.getCallingUid();
final boolean hasPermission = mAtmService.isInstrumenting(pid)
|| checkCallingPermission(MODIFY_TOUCH_MODE_STATE, "setInTouchMode()");
final boolean hasPermission =
mAtmService.instrumentationSourceHasPermission(pid, MODIFY_TOUCH_MODE_STATE)
|| checkCallingPermission(MODIFY_TOUCH_MODE_STATE, "setInTouchMode()");
final long token = Binder.clearCallingIdentity();
try {
if (mInputManager.setInTouchMode(mode, pid, uid, hasPermission)) {

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

@@ -70,7 +70,7 @@ import org.junit.runner.RunWith;
/**
* Build/Install/Run:
* atest WmTests:WindowManagerServiceTests
* atest WmTests:WindowManagerServiceTests
*/
@SmallTest
@Presubmit
@@ -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);