Merge "Add BIND_INCLUDE_CAPABILITIES flag to ContentCaptureService" into rvc-dev am: a33bc9b65a

Change-Id: I97b1b3e5566275e4eac8af4ae6e1b6614d5afd74
2020-05-28 16:52:13 +00:00
parent 548fac7ef3 a33bc9b65a
commit b0bdd7b005
1 changed files with 3 additions and 1 deletions
--- a/services/contentcapture/java/com/android/server/contentcapture/RemoteContentCaptureService.java
+++ b/services/contentcapture/java/com/android/server/contentcapture/RemoteContentCaptureService.java
@@ -54,7 +54,9 @@ final class RemoteContentCaptureService
            boolean verbose, int idleUnbindTimeoutMs) {
        super(context, serviceInterface, serviceComponentName, userId, perUserService,
                context.getMainThreadHandler(),
-                bindInstantServiceAllowed ? Context.BIND_ALLOW_INSTANT : 0, verbose,
+                Context.BIND_INCLUDE_CAPABILITIES
+                        | (bindInstantServiceAllowed ? Context.BIND_ALLOW_INSTANT : 0),
+                verbose,
                /* initialCapacity= */ 2);
        mPerUserService = perUserService;
        mServerCallback = callback.asBinder();