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

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

[conflict] Merge changes I639960af,I7167f6fd am: 9e7b36cb am: b580c94f am: e3432ffd 

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



Change-Id: Ifbf49c96b029d4c176f0edc7b6f8ee86bd3afcd5
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 972482d0 e3432ffd

system/audio_a2dp_hw/Android.bp

+4 −1
Original line number Diff line number Diff line
@@ -35,7 +35,10 @@ cc_library { 
        "liblog",

        "libcutils",

    ],

    static_libs: ["libosi"],

    static_libs: [

        "libbluetooth_gd",

        "libosi",

    ],

}



cc_library_static {

system/btif/src/btif_dm.cc

+3 −53
Original line number Diff line number Diff line
@@ -29,10 +29,6 @@ 


#include "btif_dm.h"



#ifdef OS_ANDROID

#include <android/sysprop/BluetoothProperties.sysprop.h>

#endif



#include <base/bind.h>

#include <base/logging.h>

#include <bluetooth/uuid.h>
@@ -51,10 +47,6 @@ 


#include <mutex>



#ifdef OS_ANDROID

#include <android/sysprop/BluetoothProperties.sysprop.h>

#endif



#include "advertise_data_parser.h"

#include "bta_csis_api.h"

#include "bta_dm_int.h"
@@ -1566,19 +1558,9 @@ void BTIF_dm_enable() { 
  }



  /* Enable or disable local privacy */

  bool ble_privacy_enabled = true;

#ifdef OS_ANDROID

  ble_privacy_enabled =

      android::sysprop::BluetoothProperties::isGapLePrivacyEnabled().value_or(

          true);

#else

  char ble_privacy_text[PROPERTY_VALUE_MAX] = "true";  // default is enabled

  if (osi_property_get(PROPERTY_BLE_PRIVACY_ENABLED, ble_privacy_text,

                       "true") &&

      !strcmp(ble_privacy_text, "false")) {

    ble_privacy_enabled = false;

  }

#endif

  bool ble_privacy_enabled =

      osi_property_get_bool(PROPERTY_BLE_PRIVACY_ENABLED, /*default=*/true);



  LOG_INFO("%s BLE Privacy: %d", __func__, ble_privacy_enabled);

  BTA_DmBleConfigLocalPrivacy(ble_privacy_enabled);
@@ -2241,27 +2223,6 @@ void btif_dm_get_local_class_of_device(DEV_CLASS device_class) { 
  device_class[1] = BTM_COD_MAJOR_UNCLASSIFIED;

  device_class[2] = BTM_COD_MINOR_UNCLASSIFIED;



#ifdef OS_ANDROID

  std::vector<std::optional<std::uint32_t>> local_device_class =

          android::sysprop::BluetoothProperties::getClassOfDevice();

  // Error check the inputs. Use the default if problems are found

  if (local_device_class.size() != 3) {

    LOG_ERROR("COD malformed, must have unsigned 3 integers.");

  } else if (!local_device_class[0].has_value()

      || local_device_class[0].value() > 0xFF) {

    LOG_ERROR("COD malformed, first value is missing or too large.");

  } else if (!local_device_class[1].has_value()

      || local_device_class[1].value() > 0xFF) {

    LOG_ERROR("COD malformed, second value is missing or too large.");

  } else if (!local_device_class[2].has_value()

      || local_device_class[2].value() > 0xFF) {

    LOG_ERROR("COD malformed, third value is missing or too large.");

  } else {

    device_class[0] = (uint8_t) local_device_class[0].value();

    device_class[1] = (uint8_t) local_device_class[1].value();

    device_class[2] = (uint8_t) local_device_class[2].value();

  }

#else

  char prop_cod[PROPERTY_VALUE_MAX];

  osi_property_get(PROPERTY_CLASS_OF_DEVICE, prop_cod, "");
@@ -2339,7 +2300,6 @@ void btif_dm_get_local_class_of_device(DEV_CLASS device_class) { 
  } else {

    LOG_ERROR("%s: COD malformed, fewer than three numbers", __func__);

  }

#endif



  LOG_DEBUG("%s: Using class of device '0x%x, 0x%x, 0x%x'", __func__,

      device_class[0], device_class[1], device_class[2]);
@@ -3268,19 +3228,9 @@ static const char* btif_get_default_local_name() { 
  if (btif_default_local_name[0] == '\0') {

    int max_len = sizeof(btif_default_local_name) - 1;



    // Use the stable sysprop on Android devices, otherwise use osi_property_get

#ifdef OS_ANDROID

    std::optional<std::string> default_local_name =

        android::sysprop::BluetoothProperties::getDefaultDeviceName();

    if (default_local_name.has_value() && default_local_name.value() != "") {

      strncpy(btif_default_local_name, default_local_name.value().c_str(),

              max_len);

    }

#else

    char prop_name[PROPERTY_VALUE_MAX];

    osi_property_get(PROPERTY_DEFAULT_DEVICE_NAME, prop_name, "");

    strncpy(btif_default_local_name, prop_name, max_len);

#endif



    // If no value was placed in the btif_default_local_name then use model name

    if (btif_default_local_name[0] == '\0') {

system/gd/Android.bp

+4 −0
Original line number Diff line number Diff line
@@ -189,6 +189,7 @@ cc_defaults { 
        ":BluetoothShimSources",

        ":BluetoothSecuritySources",

        ":BluetoothStorageSources",

        ":BluetoothSyspropsSources",

    ],

    generated_headers: [

        "BluetoothGeneratedBundlerSchema_h_bfbs",
@@ -199,6 +200,9 @@ cc_defaults { 
        "libcrypto",

        "libflatbuffers-cpp",

    ],

    whole_static_libs: [

        "libc++fs",

    ],

    static_libs: [

        "libbluetooth-dumpsys",

        "libbluetooth-protos",

system/gd/BUILD.gn

+1 −0
Original line number Diff line number Diff line
@@ -80,6 +80,7 @@ static_library("libbluetooth_gd") { 
    "//bt/system/gd/security:BluetoothSecuritySources",

    "//bt/system/gd/shim:BluetoothShimSources",

    "//bt/system/gd/storage:BluetoothStorageSources",

    "//bt/system/gd/sysprops:BluetoothSyspropsSources",

  ]

}

system/gd/os/android/parameter_provider.cc

+5 −0
Original line number Diff line number Diff line
@@ -82,6 +82,11 @@ void ParameterProvider::OverrideSnoozLogFilePath(const std::string& path) { 
  snooz_log_file_path = path;

}



// Android doesn't have a need for the sysprops module

std::string ParameterProvider::SyspropsFilePath() {

  return "";

}



bluetooth_keystore::BluetoothKeystoreInterface* ParameterProvider::GetBtKeystoreInterface() {

  std::lock_guard<std::mutex> lock(parameter_mutex);

  return bt_keystore_interface;