commit a33bc9b65a799695bdf488ee87eb7c1b8b91ffbf
author TreeHugger Robot <treehugger-gerrit@google.com> Thu May 28 16:51:02 2020 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu May 28 16:51:02 2020 +0000
tree 9e3555758044a485e164a1d51af4aabbc24217bd
parent c5daa54a2a85614d6c9b0cc74dafd2a5a22ba516
parent da8e520a89984c20661d03d67ef924cf62dc393a

Merge "Add BIND_INCLUDE_CAPABILITIES flag to ContentCaptureService" into rvc-dev

services/contentcapture/java/com/android/server/contentcapture/RemoteContentCaptureService.java

diff --git a/services/contentcapture/java/com/android/server/contentcapture/RemoteContentCaptureService.java b/services/contentcapture/java/com/android/server/contentcapture/RemoteContentCaptureService.java
index 9a170ac..0b9bf39 100644
--- a/services/contentcapture/java/com/android/server/contentcapture/RemoteContentCaptureService.java
+++ b/services/contentcapture/java/com/android/server/contentcapture/RemoteContentCaptureService.java
@@ -54,7 +54,9 @@
             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();