summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> 2025-03-22 17:03:04 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 2025-03-22 17:03:04 -0700
commitd6f096d1a8c0f32a295812188eb0461903e3b687 (patch)
tree65e9f5e85800e9aa7b19a963ed19e724496dafec
parent48c32ce7a0d6d0cfaff65105e4254a84bc9fb94c (diff)
parent23b25615fd2133f58a0a2953bd9c1f8589f82024 (diff)
Merge "flag: Remove mcp_allow_play_without_active_player flag" into main
-rw-r--r--android/app/src/com/android/bluetooth/mcp/MediaControlProfile.java4
-rw-r--r--flags/Android.bp1
-rw-r--r--flags/BUILD.gn1
-rw-r--r--flags/mcp.aconfig13
4 files changed, 1 insertions, 18 deletions
diff --git a/android/app/src/com/android/bluetooth/mcp/MediaControlProfile.java b/android/app/src/com/android/bluetooth/mcp/MediaControlProfile.java
index b96923ca7d..aff115c59e 100644
--- a/android/app/src/com/android/bluetooth/mcp/MediaControlProfile.java
+++ b/android/app/src/com/android/bluetooth/mcp/MediaControlProfile.java
@@ -39,7 +39,6 @@ import com.android.bluetooth.audio_util.MediaData;
import com.android.bluetooth.audio_util.MediaPlayerList;
import com.android.bluetooth.audio_util.MediaPlayerWrapper;
import com.android.bluetooth.btservice.AdapterService;
-import com.android.bluetooth.flags.Flags;
import com.android.bluetooth.le_audio.ContentControlIdKeeper;
import com.android.internal.annotations.VisibleForTesting;
@@ -409,8 +408,7 @@ public class MediaControlProfile implements MediaControlServiceCallbacks {
+ Request.Opcodes.toString(request.opcode()));
Request.Results status = Request.Results.COMMAND_CANNOT_BE_COMPLETED;
- if (Flags.mcpAllowPlayWithoutActivePlayer()
- && !Utils.isPtsTestMode()
+ if (!Utils.isPtsTestMode()
&& mMediaPlayerList.getActivePlayer() == null
&& request.opcode() == Request.Opcodes.PLAY) {
Log.d(TAG, "Player is not active. GMCS send media key for PLAY");
diff --git a/flags/Android.bp b/flags/Android.bp
index 80a57891a5..6f1e67e262 100644
--- a/flags/Android.bp
+++ b/flags/Android.bp
@@ -34,7 +34,6 @@ aconfig_declarations {
"le_scanning.aconfig",
"leaudio.aconfig",
"mapclient.aconfig",
- "mcp.aconfig",
"metric.aconfig",
"opp.aconfig",
"pairing.aconfig",
diff --git a/flags/BUILD.gn b/flags/BUILD.gn
index da5aa8621b..a53cb379fe 100644
--- a/flags/BUILD.gn
+++ b/flags/BUILD.gn
@@ -27,7 +27,6 @@ aconfig("bluetooth_flags_c_lib") {
"le_scanning.aconfig",
"leaudio.aconfig",
"mapclient.aconfig",
- "mcp.aconfig",
"metric.aconfig",
"opp.aconfig",
"pairing.aconfig",
diff --git a/flags/mcp.aconfig b/flags/mcp.aconfig
deleted file mode 100644
index 80567acae7..0000000000
--- a/flags/mcp.aconfig
+++ /dev/null
@@ -1,13 +0,0 @@
-package: "com.android.bluetooth.flags"
-container: "com.android.bt"
-
-flag {
- name: "mcp_allow_play_without_active_player"
- namespace: "bluetooth"
- description: "Handle LeAudio play same as in AVRCP in case player is not active"
- bug: "337169240"
- metadata {
- purpose: PURPOSE_BUGFIX
- }
-
-}