From 76724683e3e70495e71844fec12120d70167dc6d Mon Sep 17 00:00:00 2001
From: Arnaud Berry <arnaudberry@google.com>
Date: Tue, 22 Sep 2020 09:45:05 -0700
Subject: Add BIND_INCLUDE_CAPABILITIES flag when binding to the service.

This allows headless media applications to access the location if they
have the permission and is needed for AAOS apps in particular.

Bug: 169242810
Bug: 156904507
Test: manual with AAOS Media app
Change-Id: I1196718638fba336a815809578f643814545baf4
---
 media/java/android/media/browse/MediaBrowser.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media/java/android/media/browse/MediaBrowser.java b/media/java/android/media/browse/MediaBrowser.java
index 3c2be5f93e30..dba86d93a809 100644
--- a/media/java/android/media/browse/MediaBrowser.java
+++ b/media/java/android/media/browse/MediaBrowser.java
@@ -185,7 +185,7 @@ public final class MediaBrowser {
                 boolean bound = false;
                 try {
                     bound = mContext.bindService(intent, mServiceConnection,
-                            Context.BIND_AUTO_CREATE);
+                            Context.BIND_AUTO_CREATE | Context.BIND_INCLUDE_CAPABILITIES);
                 } catch (Exception ex) {
                     Log.e(TAG, "Failed binding to service " + mServiceComponent);
                 }
-- 
cgit v1.2.3-59-g8ed1b