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

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

Browse Source
This commit is contained in:
Qasid Sadiq
2020-05-07 23:43:57 +00:00
committed by Android (Google) Code Review
parent ca7fc3be0f b8e8c095dd
commit d59670170f
2 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
services/accessibility/java/com/android/server/accessibility/AccessibilityServiceConnection.java
View File

@@ -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;
} }

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

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