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

Commit 5ce54697 authored by Rahul Arya's avatar Rahul Arya Committed by Android (Google) Code Review
Browse files

Merge "Pass IRK rotation flag into native" into tm-dev

parents 031dc503 f7443b78
Loading
Loading
Loading
Loading
+4 −0
Original line number Diff line number Diff line
@@ -5080,6 +5080,7 @@ public class AdapterService extends Service {
    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 IRK_ROTATION_FLAG = "INIT_irk_rotation";

    /**
     * Logging flags logic (only applies to DEBUG and VERBOSE levels):
@@ -5136,6 +5137,9 @@ public class AdapterService extends Service {
                GATT_ROBUST_CACHING_FLAG, false)) {
            initFlags.add(String.format("%s=%s", GATT_ROBUST_CACHING_FLAG, "true"));
        }
        if (DeviceConfig.getBoolean(DeviceConfig.NAMESPACE_BLUETOOTH, IRK_ROTATION_FLAG, false)) {
            initFlags.add(String.format("%s=%s", IRK_ROTATION_FLAG, "true"));
        }
        if (DeviceConfig.getBoolean(DeviceConfig.NAMESPACE_BLUETOOTH,
                LOGGING_DEBUG_ENABLED_FOR_ALL_FLAG, false)) {
            initFlags.add(String.format("%s=%s", LOGGING_DEBUG_ENABLED_FOR_ALL_FLAG, "true"));