Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4e2084eb authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge changes I6303ecbc,Ie0dddd9a into main am: 547dc3ae 

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/3257657



Change-Id: Icf5b029a0f310ca1f26053b01da2546791482277
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 69577f2a 547dc3ae

android/app/src/com/android/bluetooth/audio_util/MediaPlayerList.java

+4 −8
Original line number Diff line number Diff line
@@ -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);

            }

            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);

        }

        List<ResolveInfo> browsablePlayerList =

                mContext.getApplicationContext()

                        .getPackageManager()

flags/framework.aconfig

+0 −7
Original line number Diff line number Diff line
@@ -35,13 +35,6 @@ flag { 
    bug: "311447399"

}



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"

flags/security.aconfig

+0 −7
Original line number Diff line number Diff line
@@ -15,13 +15,6 @@ flag { 
    bug: "333634398"

}



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"

system/stack/smp/smp_act.cc

+8 −11
Original line number Diff line number Diff line
@@ -681,9 +681,7 @@ 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)) &&

  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
@@ -692,7 +690,6 @@ void smp_proc_rand(tSMP_CB* p_cb, tSMP_INT_DATA* p_data) { 
    smp_sm_event(p_cb, SMP_AUTH_CMPL_EVT, &smp_int_data);

    return;

  }

  }



  /* save the SRand for comparison */

  STREAM_TO_ARRAY(p_cb->rrand.data(), p, OCTET16_LEN);