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

Commit 693893db authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Add init flag INIT_gd_acl" am: 9487ef6b am: e8fd1fe5 am: 08c907ac am: 27127c54 

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

Change-Id: I1f8ca903b558232d35f5fefe0a0066ddf8616c82
parents 11e6d4a6 27127c54

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

+4 −1
Original line number Original line Diff line number Diff line
@@ -30,7 +30,6 @@ import android.app.ActivityManager; 
import android.app.AlarmManager;

import android.app.AlarmManager;

import android.app.AppOpsManager;

import android.app.AppOpsManager;

import android.app.PendingIntent;

import android.app.PendingIntent;

import android.app.PropertyInvalidatedCache;

import android.app.Service;

import android.app.Service;

import android.app.admin.DevicePolicyManager;

import android.app.admin.DevicePolicyManager;

import android.bluetooth.BluetoothActivityEnergyInfo;

import android.bluetooth.BluetoothActivityEnergyInfo;
@@ -3061,6 +3060,7 @@ public class AdapterService extends Service { 
    private static final String GD_ADVERTISING_FLAG = "INIT_gd_advertising";

    private static final String GD_ADVERTISING_FLAG = "INIT_gd_advertising";

    private static final String GD_HCI_FLAG = "INIT_gd_hci";

    private static final String GD_HCI_FLAG = "INIT_gd_hci";

    private static final String GD_CONTROLLER_FLAG = "INIT_gd_controller";

    private static final String GD_CONTROLLER_FLAG = "INIT_gd_controller";

    private static final String GD_ACL_FLAG = "INIT_gd_acl";

    private String[] getInitFlags() {

    private String[] getInitFlags() {

        ArrayList<String> initFlags = new ArrayList<>();

        ArrayList<String> initFlags = new ArrayList<>();

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

        if (DeviceConfig.getBoolean(DeviceConfig.NAMESPACE_BLUETOOTH, GD_CORE_FLAG, false)) {
@@ -3075,6 +3075,9 @@ public class AdapterService extends Service { 
        if (DeviceConfig.getBoolean(DeviceConfig.NAMESPACE_BLUETOOTH, GD_CONTROLLER_FLAG, false)) {

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

            initFlags.add(GD_CONTROLLER_FLAG);

            initFlags.add(GD_CONTROLLER_FLAG);

        }

        }

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

            initFlags.add(GD_ACL_FLAG);

        }

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

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

    }

    }