Merge "Add BIND_INCLUDE_CAPABILITIES flag to ContentCaptureService" into rvc-dev am: a33bc9b65a am: b0bdd7b005 am: dd08187184 am: 2c4afa7fe1

Change-Id: I8c346d7814c4566341ad4bb679d136c6ea122618
2020-05-28 17:51:40 +00:00
parent 02f98ef86c 2c4afa7fe1
commit 0b3dc7a5c9
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();