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

Commit 909bc71f authored by William Escande's avatar William Escande Committed by Gerrit Code Review
Browse files

Merge changes from topic "convergence_sydney_adi_support"

* changes:
  BT5.3: Set min encryption key size -- post cleanup
  BT5.3: Set min encryption -- feature flag
  BT5.3: Periodic Advertising adi -- post cleanup
  BT5.3: Periodic Advtising adi -- feature flag
  BT5.3 Features: ADI and Encrypt key size
parents c47a5d14 82c93ab1
Loading
Loading
Loading
Loading
+1 −0
Original line number Diff line number Diff line
@@ -62,6 +62,7 @@ cc_library_shared {
        "libbluetooth_headers",
    ],
    include_dirs: [
        "packages/modules/Bluetooth/system",
        "packages/modules/Bluetooth/system/types",
        "packages/modules/Bluetooth/system/gd",
    ],
+5 −2
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@
#include <shared_mutex>

#include "com_android_bluetooth.h"
#include "gd/common/init_flags.h"
#include "hardware/bt_gatt.h"
#include "utils/Log.h"
#define info(fmt, ...) ALOGI("%s(L%d): " fmt, __func__, __LINE__, ##__VA_ARGS__)
@@ -2150,7 +2151,8 @@ static PeriodicAdvertisingParameters parsePeriodicParams(JNIEnv* env,
  uint16_t interval = env->CallIntMethod(i, methodId);

  p.enable = true;
  p.include_adi = false;
  p.include_adi =
      bluetooth::common::init_flags::periodic_advertising_adi_is_enabled();
  p.min_interval = interval;
  p.max_interval = interval + 16; /* 20ms difference betwen min and max */
  uint16_t props = 0;
@@ -2348,7 +2350,8 @@ static void setPeriodicAdvertisingEnableNative(JNIEnv* env, jobject object,
                                               jboolean enable) {
  if (!sGattIf) return;

  bool include_adi = false;
  bool include_adi =
      bluetooth::common::init_flags::periodic_advertising_adi_is_enabled();
  sGattIf->advertiser->SetPeriodicAdvertisingEnable(
      advertiser_id, enable, include_adi,
      base::Bind(&enablePeriodicSetCb, advertiser_id, enable));
+1 −0
Original line number Diff line number Diff line
@@ -76,6 +76,7 @@ service ControllerFacade {
  rpc SupportsBlePowerControlRequest(google.protobuf.Empty) returns (SupportedMsg) {}
  rpc SupportsBlePowerChangeIndication(google.protobuf.Empty) returns (SupportedMsg) {}
  rpc SupportsBlePathLossMonitoring(google.protobuf.Empty) returns (SupportedMsg) {}
  rpc SupportsBlePeriodicAdvertisingAdi(google.protobuf.Empty) returns (SupportedMsg) {}
}

message NameMsg {
+1 −0
Original line number Diff line number Diff line
@@ -68,6 +68,7 @@ typedef struct controller_t {
  bool (*supports_sniff_subrating)(void);
  bool (*supports_encryption_pause)(void);
  bool (*supports_configure_data_path)(void);
  bool (*supports_set_min_encryption_key_size)(void);

  bool (*supports_ble)(void);
  bool (*supports_ble_packet_extension)(void);
+2 −0
Original line number Diff line number Diff line
@@ -31,10 +31,12 @@ table InitFlagsData {
    leaudio_targeted_announcement_reconnection_mode_is_enabled: bool (privacy:"Any");
    logging_debug_enabled_for_all_is_enabled:bool (privacy:"Any");
    pass_phy_update_callback_is_enabled:bool (privacy:"Any");
    periodic_advertising_adi_is_enabled:bool (privacy:"Any");
    queue_l2cap_coc_while_encrypting_is_enabled:bool (privacy:"Any");
    redact_log_is_enabled:bool (privacy:"Any");
    sdp_serialization_is_enabled:bool (privacy:"Any");
    sdp_skip_rnr_if_known_is_enabled:bool (privacy:"Any");
    set_min_encryption_is_enabled:bool (privacy:"Any");
    trigger_advertising_callbacks_on_first_resume_after_pause_is_enabled:bool (privacy:"Any");
}
// LINT.ThenChange(/system/gd/dumpsys/init_flags.cc)
Loading