Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b1c71e36 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Add BIND_INCLUDE_CAPABILITIES flag to ContentCaptureService" into... 

Merge "Add BIND_INCLUDE_CAPABILITIES flag to ContentCaptureService" into rvc-dev am: a33bc9b6 am: 2d55fb05

Change-Id: I0adcc2cb6f902fe9fac86d07cc6a8751f6617b35
parents c62e4010 2d55fb05

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

+3 −1
Original line number Diff line number Diff line
@@ -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();