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

Commit 5273fe8d authored by William Escande's avatar William Escande Committed by Automerger Merge Worker
Browse files

Merge "Add getActiveDevices api" into stage-aosp-master am: c8852ad5 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15853560

Change-Id: Iec72b027795c2140a5135c44261cc82895d02f00
parents c63f402b c8852ad5

core/api/system-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -1942,6 +1942,7 @@ package android.bluetooth { 
    method @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT) public boolean enableBLE();

    method @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT) public boolean enableNoAutoConnect();

    method @RequiresPermission(allOf={android.Manifest.permission.BLUETOOTH_CONNECT, android.Manifest.permission.BLUETOOTH_PRIVILEGED}) public void generateLocalOobData(int, @NonNull java.util.concurrent.Executor, @NonNull android.bluetooth.BluetoothAdapter.OobDataCallback);

    method @NonNull @RequiresPermission(allOf={android.Manifest.permission.BLUETOOTH_CONNECT, android.Manifest.permission.BLUETOOTH_PRIVILEGED}) public java.util.List<android.bluetooth.BluetoothDevice> getActiveDevices(int);

    method @RequiresPermission(allOf={android.Manifest.permission.BLUETOOTH_CONNECT, android.Manifest.permission.BLUETOOTH_PRIVILEGED}) public long getDiscoveryEndMillis();

    method public boolean isBleScanAlwaysAvailable();

    method public boolean isLeEnabled();

core/java/android/bluetooth/BluetoothAdapter.java

+51 −0
Original line number Diff line number Diff line
@@ -511,6 +511,12 @@ public final class BluetoothAdapter { 
    @SystemApi

    public static final int ACTIVE_DEVICE_ALL = 2;



    /** @hide */

    @IntDef({BluetoothProfile.HEADSET, BluetoothProfile.A2DP,

            BluetoothProfile.HEARING_AID})

    @Retention(RetentionPolicy.SOURCE)

    public @interface ActiveDeviceProfile {}



    /**

     * Broadcast Action: The local Bluetooth adapter has started the remote

     * device discovery process.
@@ -2008,6 +2014,51 @@ public final class BluetoothAdapter { 
        return false;

    }



    /**

     * Get the active devices for the BluetoothProfile specified

     *

     * @param profile is the profile from which we want the active devices.

     *                Possible values are:

     *                {@link BluetoothProfile#HEADSET},

     *                {@link BluetoothProfile#A2DP},

     *                {@link BluetoothProfile#HEARING_AID}

     * @return A list of active bluetooth devices

     * @throws IllegalArgumentException If profile is not one of {@link ActiveDeviceProfile}

     * @hide

     */

    @SystemApi

    @RequiresPermission(allOf = {

            android.Manifest.permission.BLUETOOTH_CONNECT,

            android.Manifest.permission.BLUETOOTH_PRIVILEGED,

    })

    public @NonNull List<BluetoothDevice> getActiveDevices(@ActiveDeviceProfile int profile) {

        if (profile != BluetoothProfile.HEADSET

                && profile != BluetoothProfile.A2DP

                && profile != BluetoothProfile.HEARING_AID) {

            Log.e(TAG, "Invalid profile param value in getActiveDevices");

            throw new IllegalArgumentException("Profiles must be one of "

                    + "BluetoothProfile.A2DP, "

                    + "BluetoothProfile.HEARING_AID, or"

                    + "BluetoothProfile.HEARING_AID");

        }

        try {

            mServiceLock.readLock().lock();

            if (mService != null) {

                if (DBG) {

                    Log.d(TAG, "getActiveDevices(profile= "

                            + BluetoothProfile.getProfileName(profile) + ")");

                }

                return mService.getActiveDevices(profile, mAttributionSource);

            }

        } catch (RemoteException e) {

            Log.e(TAG, "", e);

        } finally {

            mServiceLock.readLock().unlock();

        }



        return new ArrayList<>();

    }



    /**

     * Return true if the multi advertisement is supported by the chipset

     *