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

Commit a2a9b085 authored by Christine Hallstrom's avatar Christine Hallstrom Committed by Gerrit Code Review
Browse files

Merge "Clean up periodic_advertising_adi flag" into main

parents 124fb75a dd9f57e6

android/app/jni/com_android_bluetooth_gatt.cpp

+2 −5
Original line number Diff line number Diff line
@@ -2222,8 +2222,7 @@ static PeriodicAdvertisingParameters parsePeriodicParams(JNIEnv* env, 
  uint16_t interval = env->CallIntMethod(i, methodId);



  p.enable = true;

  p.include_adi =

      bluetooth::common::init_flags::periodic_advertising_adi_is_enabled();

  p.include_adi = true;

  p.min_interval = interval;

  p.max_interval = interval + 16; /* 20ms difference betwen min and max */

  uint16_t props = 0;
@@ -2431,10 +2430,8 @@ static void setPeriodicAdvertisingEnableNative(JNIEnv* /* env */, 
                                               jboolean enable) {

  if (!sGattIf) return;



  bool include_adi =

      bluetooth::common::init_flags::periodic_advertising_adi_is_enabled();

  sGattIf->advertiser->SetPeriodicAdvertisingEnable(

      advertiser_id, enable, include_adi,

      advertiser_id, enable, true /*include_adi*/,

      base::Bind(&enablePeriodicSetCb, advertiser_id, enable));

}

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

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

        leaudio_targeted_announcement_reconnection_mode = true,

        pbap_pse_dynamic_version_upgrade = false,

        periodic_advertising_adi = true,

        private_gatt = true,

        redact_log = true,

        rust_event_loop = true,

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

+0 −1
Original line number Diff line number Diff line
@@ -34,7 +34,6 @@ mod ffi { 
        fn irk_rotation_is_enabled() -> bool;

        fn leaudio_targeted_announcement_reconnection_mode_is_enabled() -> bool;

        fn pbap_pse_dynamic_version_upgrade_is_enabled() -> bool;

        fn periodic_advertising_adi_is_enabled() -> bool;

        fn private_gatt_is_enabled() -> bool;

        fn redact_log_is_enabled() -> bool;

        fn rust_event_loop_is_enabled() -> bool;