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

Commit dd156ef0 authored by Qasid Sadiq's avatar Qasid Sadiq Committed by Automerger Merge Worker
Browse files

Merge "Give AccessibilityServices System Capabilities." into rvc-dev am:... 

Merge "Give AccessibilityServices System Capabilities." into rvc-dev am: d5967017 am: 537dd7d5 am: 461f2ab9

Change-Id: Ic906169c522914a0046638b62a77bf6ab3293810
parents 17eddb36 461f2ab9

services/accessibility/java/com/android/server/accessibility/AccessibilityServiceConnection.java

+4 −2
Original line number Original line Diff line number Diff line
@@ -94,8 +94,10 @@ class AccessibilityServiceConnection extends AbstractAccessibilityServiceConnect 
        if (userState == null) return;

        if (userState == null) return;

        final long identity = Binder.clearCallingIdentity();

        final long identity = Binder.clearCallingIdentity();

        try {

        try {

            int flags = Context.BIND_AUTO_CREATE | Context.BIND_FOREGROUND_SERVICE_WHILE_AWAKE

            int flags = Context.BIND_AUTO_CREATE

                    | Context.BIND_ALLOW_BACKGROUND_ACTIVITY_STARTS;

                    | Context.BIND_FOREGROUND_SERVICE_WHILE_AWAKE

                    | Context.BIND_ALLOW_BACKGROUND_ACTIVITY_STARTS

                    | Context.BIND_INCLUDE_CAPABILITIES;

            if (userState.getBindInstantServiceAllowedLocked()) {

            if (userState.getBindInstantServiceAllowedLocked()) {

                flags |= Context.BIND_ALLOW_INSTANT;

                flags |= Context.BIND_ALLOW_INSTANT;

            }

            }

services/tests/servicestests/src/com/android/server/accessibility/AccessibilityServiceConnectionTest.java

+5 −2
Original line number Original line Diff line number Diff line
@@ -129,8 +129,11 @@ public class AccessibilityServiceConnectionTest { 
    public void bind_requestsContextToBindService() {

    public void bind_requestsContextToBindService() {

        mConnection.bindLocked();

        mConnection.bindLocked();

        verify(mMockContext).bindServiceAsUser(any(Intent.class), eq(mConnection),

        verify(mMockContext).bindServiceAsUser(any(Intent.class), eq(mConnection),

                eq(Context.BIND_AUTO_CREATE | Context.BIND_FOREGROUND_SERVICE_WHILE_AWAKE

                eq(Context.BIND_AUTO_CREATE

                | Context.BIND_ALLOW_BACKGROUND_ACTIVITY_STARTS), any(UserHandle.class));

                        | Context.BIND_FOREGROUND_SERVICE_WHILE_AWAKE

                        | Context.BIND_ALLOW_BACKGROUND_ACTIVITY_STARTS

                        | Context.BIND_INCLUDE_CAPABILITIES),

                any(UserHandle.class));

    }

    }





    @Test

    @Test