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

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

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

Change-Id: If8a850c1582801374597239b685b552b564d4c3c
parents 4bb88ecf d5967017

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

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

        final long identity = Binder.clearCallingIdentity();

        try {

            int flags = Context.BIND_AUTO_CREATE | Context.BIND_FOREGROUND_SERVICE_WHILE_AWAKE

                    | Context.BIND_ALLOW_BACKGROUND_ACTIVITY_STARTS;

            int flags = Context.BIND_AUTO_CREATE

                    | Context.BIND_FOREGROUND_SERVICE_WHILE_AWAKE

                    | Context.BIND_ALLOW_BACKGROUND_ACTIVITY_STARTS

                    | Context.BIND_INCLUDE_CAPABILITIES;

            if (userState.getBindInstantServiceAllowedLocked()) {

                flags |= Context.BIND_ALLOW_INSTANT;

            }

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

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

        mConnection.bindLocked();

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

                eq(Context.BIND_AUTO_CREATE | Context.BIND_FOREGROUND_SERVICE_WHILE_AWAKE

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

                eq(Context.BIND_AUTO_CREATE

                        | Context.BIND_FOREGROUND_SERVICE_WHILE_AWAKE

                        | Context.BIND_ALLOW_BACKGROUND_ACTIVITY_STARTS

                        | Context.BIND_INCLUDE_CAPABILITIES),

                any(UserHandle.class));

    }



    @Test