Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b2f0c740 authored by Antonio Kantek's avatar Antonio Kantek Committed by Automerger Merge Worker
Browse files

Merge "Silent touch mode permission check" into tm-dev am: 41cf2d48 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17263395

Change-Id: Iec7a6de7d83e67831f5a6840473fefe3b2c38e5c
parents 48f75b71 41cf2d48

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

+2 −1
Original line number Diff line number Diff line
@@ -3784,7 +3784,8 @@ public class WindowManagerService extends IWindowManager.Stub 
            final int uid = Binder.getCallingUid();

            final boolean hasPermission =

                    mAtmService.instrumentationSourceHasPermission(pid, MODIFY_TOUCH_MODE_STATE)

                            || checkCallingPermission(MODIFY_TOUCH_MODE_STATE, "setInTouchMode()");

                            || checkCallingPermission(MODIFY_TOUCH_MODE_STATE, "setInTouchMode()",

                                                      /* printlog= */ false);

            final long token = Binder.clearCallingIdentity();

            try {

                if (mInputManager.setInTouchMode(mode, pid, uid, hasPermission)) {

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

+2 −2
Original line number Diff line number Diff line
@@ -292,7 +292,7 @@ public class WindowManagerServiceTests extends WindowTestsBase { 
        boolean currentTouchMode = mWm.getInTouchMode();

        int callingPid = Binder.getCallingPid();

        int callingUid = Binder.getCallingUid();

        doReturn(false).when(mWm).checkCallingPermission(anyString(), anyString());

        doReturn(false).when(mWm).checkCallingPermission(anyString(), anyString(), anyBoolean());

        when(mWm.mAtmService.instrumentationSourceHasPermission(callingPid,

                android.Manifest.permission.MODIFY_TOUCH_MODE_STATE)).thenReturn(true);
@@ -307,7 +307,7 @@ public class WindowManagerServiceTests extends WindowTestsBase { 
        boolean currentTouchMode = mWm.getInTouchMode();

        int callingPid = Binder.getCallingPid();

        int callingUid = Binder.getCallingUid();

        doReturn(false).when(mWm).checkCallingPermission(anyString(), anyString());

        doReturn(false).when(mWm).checkCallingPermission(anyString(), anyString(), anyBoolean());

        when(mWm.mAtmService.instrumentationSourceHasPermission(callingPid,

                android.Manifest.permission.MODIFY_TOUCH_MODE_STATE)).thenReturn(false);