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

Commit 139987b1 authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Snap for 7318334 from 2990bf52 to sc-release 

Change-Id: Iacdac60ec44a8fcb5b69067cff175bf97e3b69ce
parents fc615762 2990bf52

system/bta/vc/devices.h

+5 −4
Original line number Diff line number Diff line
@@ -17,13 +17,14 @@ 


#pragma once



#include <hardware/bt_vc.h>



#include <cstdint>

#include <unordered_set>

#include <vector>



#include "bta_gatt_api.h"

#include "types.h"

#include "bta/include/bta_gatt_api.h"

#include "bta/vc/types.h"

#include "include/hardware/bt_vc.h"

#include "types/raw_address.h"



namespace bluetooth {

namespace vc {

system/btif/Android.bp

+7 −1
Original line number Diff line number Diff line
@@ -317,7 +317,6 @@ cc_test { 
        "packages/modules/Bluetooth/system/bta/dm",

        "packages/modules/Bluetooth/system/bta/include",

        "packages/modules/Bluetooth/system/bta/sys",

        "packages/modules/Bluetooth/system/btcore/include",

        "packages/modules/Bluetooth/system/btif/avrcp",

        "packages/modules/Bluetooth/system/btif/co",

        "packages/modules/Bluetooth/system/btif/include",
@@ -353,6 +352,12 @@ cc_test { 
          ":TestMockUdrv",

          "test/btif_stack_test.cc",

      ],

      generated_headers: [

        "BluetoothGeneratedBundlerSchema_h_bfbs",

        "BluetoothGeneratedDumpsysDataSchema_h",

        "BluetoothGeneratedDumpsysTestData_h",

        "BluetoothGeneratedPackets_h",

      ],

      header_libs: ["libbluetooth_headers"],

      shared_libs: [

          "android.hardware.bluetooth.a2dp@1.0",
@@ -360,6 +365,7 @@ cc_test { 
          "android.hardware.bluetooth.audio@2.1",

          "libcrypto",

          "libcutils",

          "libflatbuffers-cpp",

          "libhidlbase",

          "liblog",

          "libtinyxml2",

system/btif/src/btif_gatt_util.cc

+0 −7
Original line number Diff line number Diff line
@@ -59,7 +59,6 @@ void btif_to_bta_response(tGATTS_RSP* p_dest, btgatt_response_t* p_src) { 
 * Encrypted link map handling

 ******************************************************************************/



#if (BLE_DELAY_REQUEST_ENC == FALSE)

static bool btif_gatt_is_link_encrypted(const RawAddress& bd_addr) {

  return BTM_IsEncrypted(bd_addr, BT_TRANSPORT_BR_EDR) ||

         BTM_IsEncrypted(bd_addr, BT_TRANSPORT_LE);
@@ -72,9 +71,7 @@ static void btif_gatt_set_encryption_cb(UNUSED_ATTR const RawAddress& bd_addr, 
    BTIF_TRACE_WARNING("%s() - Encryption failed (%d)", __func__, result);

  }

}

#endif



#if (BLE_DELAY_REQUEST_ENC == FALSE)

void btif_gatt_check_encrypted_link(RawAddress bd_addr,

                                    tBT_TRANSPORT transport_link) {

  tBTM_LE_PENC_KEYS key;
@@ -89,10 +86,6 @@ void btif_gatt_check_encrypted_link(RawAddress bd_addr, 
                        BTM_BLE_SEC_ENCRYPT);

  }

}

#else

void btif_gatt_check_encrypted_link(UNUSED_ATTR RawAddress bd_addr,

                                    UNUSED_ATTR tBT_TRANSPORT transport_link) {}

#endif



void btif_gatt_move_track_adv_data(btgatt_track_adv_info_t* p_dest,

                                   btgatt_track_adv_info_t* p_src) {

system/gd/packet/parser/packet_def.cc

+4 −0
Original line number Diff line number Diff line
@@ -185,6 +185,10 @@ void PacketDef::GenValidator(std::ostream& s) const { 
  s << "protected:";

  s << "virtual bool IsValid_() const {";



  if (parent_ != nullptr) {

    s << "if (!" << parent_->name_ << "View::IsValid_()) { return false; } ";

  }



  // Offset by the parents known size. We know that any dynamic fields can

  // already be called since the parent must have already been validated by

  // this point.

system/gd/stack_manager.h

+5 −0
Original line number Diff line number Diff line
@@ -32,6 +32,11 @@ class StackManager { 
    return static_cast<T*>(registry_.Get(&T::Factory));

  }



  template <class T>

  bool IsStarted() const {

    return registry_.IsStarted(&T::Factory);

  }



 private:

  os::Thread* management_thread_ = nullptr;

  os::Handler* handler_ = nullptr;