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

Commit 18b50b5f authored by Winson Chung's avatar Winson Chung Committed by Automerger Merge Worker
Browse files

Merge "Use provided calling uid/pid for checking intercept-global-drag flag"... 

Merge "Use provided calling uid/pid for checking intercept-global-drag flag" into tm-dev am: 4ef3f4a3 am: fd4c7586 am: 1c58374e

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



Change-Id: I46a0b57bf2107519e5b7761fdaffc6e86e9c9ac6
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 5fd29b5f 1c58374e

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

+3 −1
Original line number Original line Diff line number Diff line
@@ -1009,7 +1009,9 @@ public class DisplayPolicy { 
                    "DisplayPolicy");

                    "DisplayPolicy");

        }

        }

        if ((attrs.privateFlags & PRIVATE_FLAG_INTERCEPT_GLOBAL_DRAG_AND_DROP) != 0) {

        if ((attrs.privateFlags & PRIVATE_FLAG_INTERCEPT_GLOBAL_DRAG_AND_DROP) != 0) {

            ActivityTaskManagerService.enforceTaskPermission("DisplayPolicy");

            mContext.enforcePermission(

                    android.Manifest.permission.MANAGE_ACTIVITY_TASKS, callingPid, callingUid,

                    "DisplayPolicy");

        }

        }





        switch (attrs.type) {

        switch (attrs.type) {

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

+2 −1
Original line number Original line Diff line number Diff line
@@ -228,7 +228,8 @@ public class DragDropControllerTests extends WindowTestsBase { 
        attrs.privateFlags |= PRIVATE_FLAG_INTERCEPT_GLOBAL_DRAG_AND_DROP;

        attrs.privateFlags |= PRIVATE_FLAG_INTERCEPT_GLOBAL_DRAG_AND_DROP;

        policy.validateAddingWindowLw(attrs, Binder.getCallingPid(), Binder.getCallingUid());

        policy.validateAddingWindowLw(attrs, Binder.getCallingPid(), Binder.getCallingUid());





        verify(mWm.mAtmService).enforceTaskPermission(any());

        verify(mWm.mContext).enforcePermission(

                eq(android.Manifest.permission.MANAGE_ACTIVITY_TASKS), anyInt(), anyInt(), any());

    }

    }





    @Test

    @Test