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

Commit 4cd7fd5d authored by William Escande's avatar William Escande
Browse files

BT5.3: Periodic Advtising adi -- feature flag 

Bug: 248126637
Tag: #feature
Test: Manual end-to-end testing (need 5.3 support in controller)
Change-Id: Ic3da3d9d1592ec2e6ada689cd6fea564947766ae
parent c4eca1e4

android/app/Android.bp

+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",

    ],

android/app/jni/com_android_bluetooth_gatt.cpp

+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));

system/gd/common/init_flags.fbs

+1 −0
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ 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");

system/gd/dumpsys/init_flags.cc

+1 −0
Original line number Diff line number Diff line
@@ -55,6 +55,7 @@ flatbuffers::Offset<bluetooth::common::InitFlagsData> bluetooth::dumpsys::InitFl 
      initFlags::leaudio_targeted_announcement_reconnection_mode_is_enabled());

  builder.add_logging_debug_enabled_for_all_is_enabled(initFlags::logging_debug_enabled_for_all_is_enabled());

  builder.add_pass_phy_update_callback_is_enabled(initFlags::pass_phy_update_callback_is_enabled());

  builder.add_periodic_advertising_adi_is_enabled(bluetooth::common::init_flags::periodic_advertising_adi_is_enabled());

  builder.add_queue_l2cap_coc_while_encrypting_is_enabled(initFlags::queue_l2cap_coc_while_encrypting_is_enabled());

  builder.add_redact_log_is_enabled(initFlags::redact_log_is_enabled());

  builder.add_sdp_serialization_is_enabled(initFlags::sdp_serialization_is_enabled());

system/gd/rust/common/src/init_flags.rs

+1 −0
Original line number Diff line number Diff line
@@ -223,6 +223,7 @@ init_flags!( 
        leaudio_targeted_announcement_reconnection_mode,

        logging_debug_enabled_for_all,

        pass_phy_update_callback = true,

        periodic_advertising_adi = true,

        queue_l2cap_coc_while_encrypting = true,

        redact_log = true,

        sdp_serialization = true,