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

Commit c8e68014 authored by Jack He's avatar Jack He Committed by Automerger Merge Worker
Browse files

Merge "Move "Service" property from ClassicDevice to Device" into main am: bee80915 

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



Change-Id: If5edfe6fc14ea0f15c6d379b4fddd6a85729102a
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 322ff62d bee80915

system/gd/storage/classic_device.h

+1 −3
Original line number Diff line number Diff line
@@ -21,7 +21,6 @@ 
#include <unordered_set>



#include "hci/link_key.h"

#include "hci/uuid.h"

#include "storage/config_cache.h"

#include "storage/config_cache_helper.h"

#include "storage/device.h"
@@ -91,7 +90,6 @@ class ClassicDevice { 
 public:

  GENERATE_PROPERTY_GETTER_SETTER_REMOVER(LinkKey, hci::LinkKey, "LinkKey");

  GENERATE_PROPERTY_GETTER_SETTER_REMOVER(LinkKeyType, hci::KeyType, "LinkKeyType");

  GENERATE_PROPERTY_GETTER_SETTER_REMOVER(ServiceUuids, std::vector<hci::Uuid>, "Service");

  GENERATE_PROPERTY_GETTER_SETTER_REMOVER(SdpDiManufacturer, uint16_t, "SdpDiManufacturer");

  GENERATE_PROPERTY_GETTER_SETTER_REMOVER(SdpDiModel, uint16_t, "SdpDiModel");

  GENERATE_PROPERTY_GETTER_SETTER_REMOVER(SdpDiHardwareVersion, uint16_t, "SdpDiHardwareVersion");

system/gd/storage/device.h

+4 −1
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ 
#include "hci/address_with_type.h"

#include "hci/class_of_device.h"

#include "hci/enum_helper.h"

#include "hci/uuid.h"

#include "storage/config_cache.h"

#include "storage/config_cache_helper.h"

#include "storage/config_keys.h"
@@ -192,6 +193,8 @@ class Device { 
        return static_cast<hci::DeviceType>(

            value | GetDeviceType().value_or(hci::DeviceType::UNKNOWN));

      });

  GENERATE_PROPERTY_GETTER_SETTER_REMOVER(

      ServiceUuids, std::vector<hci::Uuid>, BTIF_STORAGE_KEY_REMOTE_SERVICE);

  GENERATE_PROPERTY_GETTER_SETTER_REMOVER(ManufacturerCode, uint16_t, "Manufacturer");

  GENERATE_PROPERTY_GETTER_SETTER_REMOVER(LmpVersion, uint8_t, "LmpVer");

  GENERATE_PROPERTY_GETTER_SETTER_REMOVER(LmpSubVersion, uint16_t, "LmpSubVer");