24q2 flag clean: keep_stopped_media_browser_service

Fix: 314855224
Bug: 314855224
Test: m Bluetooth
Flag: com.android.bluetooth.flags.keep_stopped_media_browser_service
Change-Id: Ie0dddd9ae129f7e3cb5d417deb23e480e4e491b4

2 files changed, 4 insertions, 15 deletions

diff --git a/android/app/src/com/android/bluetooth/audio_util/MediaPlayerList.java b/android/app/src/com/android/bluetooth/audio_util/MediaPlayerList.java
index d696b608d3..1cbde5ec5e 100644
--- a/android/app/src/com/android/bluetooth/audio_util/MediaPlayerList.java
+++ b/android/app/src/com/android/bluetooth/audio_util/MediaPlayerList.java
@@ -233,10 +233,8 @@ public class MediaPlayerList {
         } else {
             // Build the list of browsable players and afterwards, build the list of media players
             Intent intent = new Intent(android.service.media.MediaBrowserService.SERVICE_INTERFACE);
-            if (Flags.keepStoppedMediaBrowserService()) {
-                // Don't query stopped apps, that would end up unstopping them
-                intent.addFlags(Intent.FLAG_EXCLUDE_STOPPED_PACKAGES);
-            }
+            // Don't query stopped apps, that would end up unstopping them
+            intent.addFlags(Intent.FLAG_EXCLUDE_STOPPED_PACKAGES);
             List<ResolveInfo> playerList =
                     mContext.getApplicationContext()
                             .getPackageManager()
@@ -856,10 +854,8 @@ public class MediaPlayerList {
                         .getPackageManager()
                         .queryIntentActivities(intentPlayer, 0);
 
-        if (Flags.keepStoppedMediaBrowserService()) {
-            // Don't query stopped apps, that would end up unstopping them
-            intentBrowsable.addFlags(Intent.FLAG_EXCLUDE_STOPPED_PACKAGES);
-        }
+        // Don't query stopped apps, that would end up unstopping them
+        intentBrowsable.addFlags(Intent.FLAG_EXCLUDE_STOPPED_PACKAGES);
         List<ResolveInfo> browsablePlayerList =
                 mContext.getApplicationContext()
                         .getPackageManager()
diff --git a/flags/framework.aconfig b/flags/framework.aconfig
index 89b398a4fa..3a1ae1b26d 100644
--- a/flags/framework.aconfig
+++ b/flags/framework.aconfig
@@ -36,13 +36,6 @@ flag {
 }
 
 flag {
-    name: "keep_stopped_media_browser_service"
-    namespace: "bluetooth"
-    description: "Do not start stopped media browser services"
-    bug: "314855224"
-}
-
-flag {
     name: "identity_address_null_if_not_known"
     namespace: "bluetooth"
     description: "Return null for identity address if identity address is not known"