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

Commit 20a12fdc 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: 2c73866d am: c74707c3 am: 74a9fda9 am: 56fc04b9

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

Change-Id: I10a0be5564c6e18ad17fd5dab3c953c6f78e5bc5
parents ef8b0243 56fc04b9

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

+4 −0
Original line number Diff line number Diff line
@@ -3082,6 +3082,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<>();
@@ -3116,6 +3117,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]);

    }