summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--android/app/src/com/android/bluetooth/audio_util/MediaPlayerList.java12
-rw-r--r--flags/framework.aconfig7
-rw-r--r--flags/security.aconfig7
-rw-r--r--system/stack/smp/smp_act.cc19
4 files changed, 12 insertions, 33 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"
diff --git a/flags/security.aconfig b/flags/security.aconfig
index 7bea36723d..2bb69eac95 100644
--- a/flags/security.aconfig
+++ b/flags/security.aconfig
@@ -16,13 +16,6 @@ flag {
}
flag {
- name: "fix_le_pairing_passkey_entry_bypass"
- namespace: "bluetooth"
- description: "Fix the passkey entry bypassing bug in SMP"
- bug: "321300737"
-}
-
-flag {
name: "bta_av_setconfig_rej_type_confusion"
namespace: "bluetooth"
description: "Use stream control block for bta_av_setconfig_rej instead of a possibly incorrect union type"
diff --git a/system/stack/smp/smp_act.cc b/system/stack/smp/smp_act.cc
index e297afa5e4..655a2061e5 100644
--- a/system/stack/smp/smp_act.cc
+++ b/system/stack/smp/smp_act.cc
@@ -681,17 +681,14 @@ void smp_proc_rand(tSMP_CB* p_cb, tSMP_INT_DATA* p_data) {
return;
}
- if (com::android::bluetooth::flags::fix_le_pairing_passkey_entry_bypass()) {
- if (!((p_cb->loc_auth_req & SMP_SC_SUPPORT_BIT) &&
- (p_cb->peer_auth_req & SMP_SC_SUPPORT_BIT)) &&
- !(p_cb->flags & SMP_PAIR_FLAGS_CMD_CONFIRM_SENT)) {
- // in legacy pairing, the peer should send its rand after
- // we send our confirm
- tSMP_INT_DATA smp_int_data{};
- smp_int_data.status = SMP_INVALID_PARAMETERS;
- smp_sm_event(p_cb, SMP_AUTH_CMPL_EVT, &smp_int_data);
- return;
- }
+ if (!((p_cb->loc_auth_req & SMP_SC_SUPPORT_BIT) && (p_cb->peer_auth_req & SMP_SC_SUPPORT_BIT)) &&
+ !(p_cb->flags & SMP_PAIR_FLAGS_CMD_CONFIRM_SENT)) {
+ // in legacy pairing, the peer should send its rand after
+ // we send our confirm
+ tSMP_INT_DATA smp_int_data{};
+ smp_int_data.status = SMP_INVALID_PARAMETERS;
+ smp_sm_event(p_cb, SMP_AUTH_CMPL_EVT, &smp_int_data);
+ return;
}
/* save the SRand for comparison */