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

Commit 049594d8 authored by Mingguang Xu's avatar Mingguang Xu Committed by Gerrit Code Review
Browse files

Merge "Enable BTAA feature by default"

parents 7437ffb3 e194d973

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

+4 −3
Original line number Diff line number Diff line
@@ -456,8 +456,6 @@ public class AdapterService extends Service { 
        mJniCallbacks = new JniCallbacks(this, mAdapterProperties);

        mBluetoothKeystoreService = new BluetoothKeystoreService(isCommonCriteriaMode());

        mBluetoothKeystoreService.start();

        mActivityAttributionService = new ActivityAttributionService();

        mActivityAttributionService.start();

        int configCompareResult = mBluetoothKeystoreService.getCompareResult();



        // Start tracking Binder latency for the bluetooth process.
@@ -512,6 +510,9 @@ public class AdapterService extends Service { 


        mBluetoothSocketManagerBinder = new BluetoothSocketManagerBinder(this);



        mActivityAttributionService = new ActivityAttributionService();

        mActivityAttributionService.start();



        setAdapterService(this);



        invalidateBluetoothCaches();
@@ -3817,7 +3818,7 @@ 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)) {

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

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

        }

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