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

Commit aef04fde 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

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

Change-Id: Ife112660fcb4984b7f7f16ad841b0e1a82c11c5d
parents fa335238 8d056a77

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

    }