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

Commit 415d41f1 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Add init flag for whether to enable bluetooth activity attribution hci... 

Merge "Add init flag for whether to enable bluetooth activity attribution hci logging" am: 8d056a77 am: aef04fde

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Bluetooth/+/1461084

Change-Id: I9e08f5b67d96a89de29f8577543ab9db5d914641
parents 76177faa aef04fde

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

+4 −0
Original line number Diff line number Diff line
@@ -3081,6 +3081,7 @@ public class AdapterService extends Service { 
            "INIT_logging_debug_enabled_for_tags";

    private static final String LOGGING_DEBUG_DISABLED_FOR_TAGS_FLAG =

            "INIT_logging_debug_disabled_for_tags";

    private static final String BTAA_HCI_LOG_FLAG = "INIT_btaa_hci";



    private String[] getInitFlags() {

        ArrayList<String> initFlags = new ArrayList<>();
@@ -3115,6 +3116,9 @@ public class AdapterService extends Service { 
            initFlags.add(String.format("%s=%s", LOGGING_DEBUG_DISABLED_FOR_TAGS_FLAG,

                    debugLoggingDisabledTags));

        }

        if (DeviceConfig.getBoolean(DeviceConfig.NAMESPACE_BLUETOOTH, BTAA_HCI_LOG_FLAG, false)) {

            initFlags.add(BTAA_HCI_LOG_FLAG);

        }

        return initFlags.toArray(new String[0]);

    }