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

Commit 206a3c79 authored by William Escande's avatar William Escande Committed by Gerrit Code Review
Browse files

Merge "Enable PBAP dynamic version upgrade"

parents 702caaf6 cdebe361

android/app/src/com/android/bluetooth/ObexServerSockets.java

+0 −14
Original line number Diff line number Diff line
@@ -96,20 +96,6 @@ public class ObexServerSockets { 


    private static final int CREATE_RETRY_TIME = 10;



    /**

      * Creates an RFCOMM {@link BluetoothServerSocket} and a L2CAP {@link BluetoothServerSocket}

      * @param validator a reference to the {@link IObexConnectionHandler} object to call

      *                  to validate an incoming connection.

      * @param rfcommChannel fixed rfcomm channel number to listen on

      * @param l2capPsm fixed l2cap psm to listen on

      * @return a reference to a {@link ObexServerSockets} object instance.

      * @throws IOException if it occurs while creating the {@link BluetoothServerSocket}s.

    */

    public static ObexServerSockets createWithFixedChannels(IObexConnectionHandler validator,

            int rfcommChannel, int l2capPsm) {

        return create(validator, rfcommChannel, l2capPsm, true);

    }



    /**

     * Creates an RFCOMM {@link BluetoothServerSocket} and a L2CAP {@link BluetoothServerSocket}

     * with specific l2cap and RFCOMM channel numbers. It is the responsibility of the caller to

android/app/src/com/android/bluetooth/sdp/SdpManager.java

+0 −2
Original line number Diff line number Diff line
@@ -51,8 +51,6 @@ public class SdpManager { 
    public static final byte PBAP_REPO_SIM = 0x01 << 1;

    public static final byte PBAP_REPO_SPEED_DAIL = 0x01 << 2;

    public static final byte PBAP_REPO_FAVORITES = 0x01 << 3;

    public static final int PBAP_RFCOMM_CHANNEL = 19;

    public static final int PBAP_L2CAP_PSM = 0x1025;



    /* Variables to keep track of ongoing and queued search requests.

     * mTrackerLock must be held, when using/changing sSdpSearchTracker

system/btif/src/btif_sdp_server.cc

+4 −0
Original line number Diff line number Diff line
@@ -670,6 +670,10 @@ static int add_pbaps_sdp(const bluetooth_sdp_pse_record* rec) { 
                               (uint8_t*)&supported_repositories_1_1);

    APPL_TRACE_DEBUG(" supported_repositories_1_1: 0x%x",

                     supported_repositories_1_1);

    sdp_save_local_pse_record_attributes(

        rec->hdr.rfcomm_channel_number, rec->hdr.l2cap_psm,

        rec->hdr.profile_version, rec->supported_features,

        rec->supported_repositories);

  } else {

    /* Add in the Bluetooth Profile Descriptor List */

    status &= SDP_AddProfileDescriptorList(

system/conf/interop_database.conf

+2 −1
Original line number Diff line number Diff line
@@ -489,6 +489,7 @@ Beats Pill+ = Name_Based 
# version correctly, leading them to go in bad state. So for better

# interoperability respond with PBAP 1.2 as supported version.

[INTEROP_ADV_PBAP_VER_1_2]

PTS = Name_Based



# Devices requiring this workaround do not handle PBAP SDP request correctly,

# and lead to connection failures. To prevent this scenario, device requiring this

system/gd/rust/common/src/init_flags.rs

+1 −1
Original line number Diff line number Diff line
@@ -276,7 +276,7 @@ init_flags!( 
        irk_rotation,

        leaudio_targeted_announcement_reconnection_mode = true,

        pass_phy_update_callback = true,

        pbap_pse_dynamic_version_upgrade = false, // Disabled while figuring out how to please pts

        pbap_pse_dynamic_version_upgrade = true,

        periodic_advertising_adi = true,

        private_gatt,

        queue_l2cap_coc_while_encrypting = true,