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

Commit 0086fbc8 authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Snap for 12742097 from d580d34c to 25Q1-release 

Change-Id: I937f472d47f243571540d4bb268d6845dba6e433
parents 4773ee4f d580d34c

android/app/src/com/android/bluetooth/btservice/ActiveDeviceManager.java

+1 −1
Original line number Diff line number Diff line
@@ -412,7 +412,7 @@ public class ActiveDeviceManager implements AdapterService.BluetoothStateCallbac 
                final LeAudioService leAudioService = mFactory.getLeAudioService();

                setA2dpActiveDevice(null, true);

                setHfpActiveDevice(null);

                if (Flags.admVerifyActiveFallbackDevice()) {

                if (Flags.admVerifyActiveFallbackDevice() && leAudioService != null) {

                    setLeAudioActiveDevice(

                            null, !leAudioService.getActiveDevices().contains(device));

                } else {

framework/tests/util/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -43,6 +43,7 @@ java_library { 
        "//packages/modules/Connectivity/nearby/tests/cts/fastpair",

        "//packages/modules/Permission/tests/cts/permission",

        "//packages/modules/Permission/tests/cts/permissionui",

        "//packages/modules/Uwb/ranging/tests/cts/tests",

        "//test/cts-root/tests/bluetooth",

    ],

}

system/btif/src/btif_dm.cc

+2 −1
Original line number Diff line number Diff line
@@ -3094,7 +3094,7 @@ static void id_status_callback(tBT_TRANSPORT transport, bool is_valid, const Oct 


  auto advertiser = bluetooth::shim::get_ble_advertiser_instance();

  ::AdvertiseParameters parameters{};

  parameters.advertising_event_properties = 0x0045 /* connectable, discoverable, tx power */;

  parameters.advertising_event_properties = 0x0041 /* connectable, tx power */;

  parameters.min_interval = 0xa0;   // 100 ms

  parameters.max_interval = 0x500;  // 800 ms

  parameters.channel_map = 0x7;     // Use all the channels
@@ -3103,6 +3103,7 @@ static void id_status_callback(tBT_TRANSPORT transport, bool is_valid, const Oct 
  parameters.secondary_advertising_phy = 2;

  parameters.scan_request_notification_enable = 0;

  parameters.own_address_type = BLE_ADDR_RANDOM;

  parameters.discoverable = true;



  std::vector<uint8_t> advertisement{0x02, 0x01 /* Flags */, 0x02 /* Connectable */};

  std::vector<uint8_t> scan_data{};

system/profile/avrcp/device.cc

+1 −0
Original line number Diff line number Diff line
@@ -154,6 +154,7 @@ void Device::VendorPacketHandler(uint8_t label, std::shared_ptr<VendorPacket> pk 
        // TODO (apanicke): Add a retry mechanism if the response has a

        // different volume than the one we set. For now, we don't care

        // about the response to this message.

        active_labels_.erase(label);

        break;

      default:

        log::warn("{}: Unhandled Response: pdu={}", address_, pkt->GetCommandPdu());