commit b402caadc5e70e3177cd2ae43ea9fc3117ef71eb
author TreeHugger Robot <treehugger-gerrit@google.com> Fri Apr 03 23:15:44 2020 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Apr 03 23:15:44 2020 +0000
tree 1c32b8bb1a07ffef7f7284a77e8b9431aa4e04ae
parent 330450c28306ee94644258fba4570da120fb28aa
parent 4fca9fc77863315be39d3ff298c28d67a27bcb60

Merge "Add BIND_INCLUDE_CAPABILITIES flags to SystemCaptionsManagerService" into rvc-dev

services/systemcaptions/java/com/android/server/systemcaptions/RemoteSystemCaptionsManagerService.java

diff --git a/services/systemcaptions/java/com/android/server/systemcaptions/RemoteSystemCaptionsManagerService.java b/services/systemcaptions/java/com/android/server/systemcaptions/RemoteSystemCaptionsManagerService.java
index 5480b6c..c225d3f 100644
--- a/services/systemcaptions/java/com/android/server/systemcaptions/RemoteSystemCaptionsManagerService.java
+++ b/services/systemcaptions/java/com/android/server/systemcaptions/RemoteSystemCaptionsManagerService.java
@@ -108,7 +108,8 @@
             }
             mBinding = true;
 
-            int flags = Context.BIND_AUTO_CREATE | Context.BIND_FOREGROUND_SERVICE;
+            int flags = Context.BIND_AUTO_CREATE | Context.BIND_FOREGROUND_SERVICE
+                    | Context.BIND_INCLUDE_CAPABILITIES;
             boolean willBind = mContext.bindServiceAsUser(mIntent, mServiceConnection, flags,
                     mHandler, new UserHandle(mUserId));
             if (!willBind) {