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

Commit a5007fa5 authored by HsingYuan Lo's avatar HsingYuan Lo Committed by Jack He
Browse files

Split robust caching flag into client and server 

Bug: 236983667
Test: build & enable/disable flags to verify client/server behaviors
Tag: #feature
Change-Id: I7282b163a49d2a4d07b39dd5a99016eb01ab92b4
Merged-In: I7282b163a49d2a4d07b39dd5a99016eb01ab92b4
(cherry picked from commit 93dee025)
parent ddac8147

android/app/src/com/android/bluetooth/btservice/AdapterService.java

+8 −3
Original line number Diff line number Diff line
@@ -5291,7 +5291,8 @@ public class AdapterService extends Service { 
    private static final String GD_L2CAP_FLAG = "INIT_gd_l2cap";

    private static final String GD_RUST_FLAG = "INIT_gd_rust";

    private static final String GD_LINK_POLICY_FLAG = "INIT_gd_link_policy";

    private static final String GATT_ROBUST_CACHING_FLAG = "INIT_gatt_robust_caching";

    private static final String GATT_ROBUST_CACHING_CLIENT_FLAG = "INIT_gatt_robust_caching_client";

    private static final String GATT_ROBUST_CACHING_SERVER_FLAG = "INIT_gatt_robust_caching_server";



    /**

     * Logging flags logic (only applies to DEBUG and VERBOSE levels):
@@ -5346,8 +5347,12 @@ public class AdapterService extends Service { 
            initFlags.add(String.format("%s=%s", GD_LINK_POLICY_FLAG, "true"));

        }

        if (DeviceConfig.getBoolean(DeviceConfig.NAMESPACE_BLUETOOTH,

                GATT_ROBUST_CACHING_FLAG, false)) {

            initFlags.add(String.format("%s=%s", GATT_ROBUST_CACHING_FLAG, "true"));

                GATT_ROBUST_CACHING_CLIENT_FLAG, false)) {

            initFlags.add(String.format("%s=%s", GATT_ROBUST_CACHING_CLIENT_FLAG, "true"));

        }

        if (DeviceConfig.getBoolean(DeviceConfig.NAMESPACE_BLUETOOTH,

                GATT_ROBUST_CACHING_SERVER_FLAG, false)) {

            initFlags.add(String.format("%s=%s", GATT_ROBUST_CACHING_SERVER_FLAG, "true"));

        }

        if (DeviceConfig.getBoolean(DeviceConfig.NAMESPACE_BLUETOOTH,

                LOGGING_DEBUG_ENABLED_FOR_ALL_FLAG, false)) {

system/bta/gatt/bta_gattc_utils.cc

+1 −1
Original line number Diff line number Diff line
@@ -677,5 +677,5 @@ tBTA_GATTC_CLCB* bta_gattc_find_int_disconn_clcb(tBTA_GATTC_DATA* p_msg) { 
 *

 ******************************************************************************/

bool bta_gattc_is_robust_caching_enabled() {

  return bluetooth::common::init_flags::gatt_robust_caching_is_enabled();

  return bluetooth::common::init_flags::gatt_robust_caching_client_is_enabled();

}

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

+2 −1
Original line number Diff line number Diff line
@@ -77,7 +77,8 @@ init_flags!( 
        gd_core,

        gd_security,

        gd_l2cap,

        gatt_robust_caching,

        gatt_robust_caching_client,

        gatt_robust_caching_server,

        btaa_hci,

        gd_rust,

        gd_link_policy

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

+2 −1
Original line number Diff line number Diff line
@@ -7,7 +7,8 @@ mod ffi { 
        fn gd_core_is_enabled() -> bool;

        fn gd_security_is_enabled() -> bool;

        fn gd_l2cap_is_enabled() -> bool;

        fn gatt_robust_caching_is_enabled() -> bool;

        fn gatt_robust_caching_client_is_enabled() -> bool;

        fn gatt_robust_caching_server_is_enabled() -> bool;

        fn btaa_hci_is_enabled() -> bool;

        fn gd_rust_is_enabled() -> bool;

        fn gd_link_policy_is_enabled() -> bool;

system/stack/gatt/gatt_attr.cc

+1 −1
Original line number Diff line number Diff line
@@ -856,7 +856,7 @@ bool gatt_profile_get_eatt_support(const RawAddress& remote_bda) { 
 *

 ******************************************************************************/

static bool gatt_sr_is_robust_caching_enabled() {

  return bluetooth::common::init_flags::gatt_robust_caching_is_enabled();

  return bluetooth::common::init_flags::gatt_robust_caching_server_is_enabled();

}



/*******************************************************************************