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

Commit 9760e3c0 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge changes I70eafe03,Ia44e16c5 

* changes:
  Hearing Aid Profile: set and get activeDevice
  Move the setActiveDevice logic from Settings to SettingsLib (1/2)
parents 6baea62a e98595e5

framework/java/android/bluetooth/BluetoothHearingAid.java

+71 −0
Original line number Original line Diff line number Diff line
@@ -17,6 +17,7 @@ 
package android.bluetooth;

package android.bluetooth;





import android.Manifest;

import android.Manifest;

import android.annotation.Nullable;

import android.annotation.RequiresPermission;

import android.annotation.RequiresPermission;

import android.annotation.SdkConstant;

import android.annotation.SdkConstant;

import android.annotation.SdkConstant.SdkConstantType;

import android.annotation.SdkConstant.SdkConstantType;
@@ -378,6 +379,76 @@ public final class BluetoothHearingAid implements BluetoothProfile { 
        }

        }

    }

    }





    /**

     * Select a connected device as active.

     *

     * The active device selection is per profile. An active device's

     * purpose is profile-specific. For example, Hearing Aid audio

     * streaming is to the active Hearing Aid device. If a remote device

     * is not connected, it cannot be selected as active.

     *

     * <p> This API returns false in scenarios like the profile on the

     * device is not connected or Bluetooth is not turned on.

     * When this API returns true, it is guaranteed that the

     * {@link #ACTION_ACTIVE_DEVICE_CHANGED} intent will be broadcasted

     * with the active device.

     *

     * <p>Requires {@link android.Manifest.permission#BLUETOOTH_ADMIN}

     * permission.

     *

     * @param device the remote Bluetooth device. Could be null to clear

     * the active device and stop streaming audio to a Bluetooth device.

     * @return false on immediate error, true otherwise

     * @hide

     */

    public boolean setActiveDevice(@Nullable BluetoothDevice device) {

        if (DBG) log("setActiveDevice(" + device + ")");

        try {

            mServiceLock.readLock().lock();

            if (mService != null && isEnabled()

                    && ((device == null) || isValidDevice(device))) {

                mService.setActiveDevice(device);

                return true;

            }

            if (mService == null) Log.w(TAG, "Proxy not attached to service");

            return false;

        } catch (RemoteException e) {

            Log.e(TAG, "Stack:" + Log.getStackTraceString(new Throwable()));

            return false;

        } finally {

            mServiceLock.readLock().unlock();

        }

    }



    /**

     * Check whether the device is active.

     *

     * <p>Requires {@link android.Manifest.permission#BLUETOOTH}

     * permission.

     *

     * @return the connected device that is active or null if no device

     * is active

     * @hide

     */

    @RequiresPermission(Manifest.permission.BLUETOOTH)

    public boolean isActiveDevice(@Nullable BluetoothDevice device) {

        if (VDBG) log("isActiveDevice()");

        try {

            mServiceLock.readLock().lock();

            if (mService != null && isEnabled()

                    && ((device == null) || isValidDevice(device))) {

                return mService.isActiveDevice(device);

            }

            if (mService == null) Log.w(TAG, "Proxy not attached to service");

            return false;

        } catch (RemoteException e) {

            Log.e(TAG, "Stack:" + Log.getStackTraceString(new Throwable()));

            return false;

        } finally {

            mServiceLock.readLock().unlock();

        }

    }



    /**

    /**

     * Set priority of the profile

     * Set priority of the profile

     *

     *