summaryrefslogtreecommitdiff
path: root/services/contentcapture
diff options
context:
space:
mode:
authorTreeHugger Robot <treehugger-gerrit@google.com>2020-05-28 16:51:02 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2020-05-28 16:51:02 +0000
commita33bc9b65a799695bdf488ee87eb7c1b8b91ffbf (patch)
tree9e3555758044a485e164a1d51af4aabbc24217bd /services/contentcapture
parentc5daa54a2a85614d6c9b0cc74dafd2a5a22ba516 (diff)
parentda8e520a89984c20661d03d67ef924cf62dc393a (diff)
Merge "Add BIND_INCLUDE_CAPABILITIES flag to ContentCaptureService" into rvc-dev
Diffstat (limited to 'services/contentcapture')
-rw-r--r--services/contentcapture/java/com/android/server/contentcapture/RemoteContentCaptureService.java4
1 files changed, 3 insertions, 1 deletions
diff --git a/services/contentcapture/java/com/android/server/contentcapture/RemoteContentCaptureService.java b/services/contentcapture/java/com/android/server/contentcapture/RemoteContentCaptureService.java
index 9a170ac6da10..0b9bf3962562 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 @@ 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();