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

Commit 6c06d9de authored by Stanley Tng's avatar Stanley Tng Committed by android-build-merger
Browse files

Merge "Cleanup annontations for Hearing Aids Profile API" am: f6b3f6a8d8 am: 11943690 

am: f21d8f46

Change-Id: I1bc62eb19c3d1bd3fd6d959163aaf9e44ab0d217
parents 495d8891 f21d8f46

framework/java/android/bluetooth/BluetoothHearingAid.java

+4 −6
Original line number Diff line number Diff line
@@ -22,7 +22,6 @@ import android.annotation.Nullable; 
import android.annotation.RequiresPermission;

import android.annotation.SdkConstant;

import android.annotation.SdkConstant.SdkConstantType;

import android.annotation.UnsupportedAppUsage;

import android.content.ComponentName;

import android.content.Context;

import android.content.Intent;
@@ -92,7 +91,6 @@ public final class BluetoothHearingAid implements BluetoothProfile { 
     * @hide

     */

    @SdkConstant(SdkConstantType.BROADCAST_INTENT_ACTION)

    @UnsupportedAppUsage

    public static final String ACTION_ACTIVE_DEVICE_CHANGED =

            "android.bluetooth.hearingaid.profile.action.ACTIVE_DEVICE_CHANGED";
@@ -324,7 +322,8 @@ public final class BluetoothHearingAid implements BluetoothProfile { 
    /**

     * {@inheritDoc}

     */

    @Override public @NonNull List<BluetoothDevice> getDevicesMatchingConnectionStates(

    @Override

    public @NonNull List<BluetoothDevice> getDevicesMatchingConnectionStates(

    @NonNull int[] states) {

        if (VDBG) log("getDevicesMatchingStates()");

        try {
@@ -346,7 +345,8 @@ public final class BluetoothHearingAid implements BluetoothProfile { 
     * {@inheritDoc}

     */

    @Override

    public int getConnectionState(@NonNull BluetoothDevice device) {

    public @BluetoothProfile.BtProfileState int getConnectionState(

    @NonNull BluetoothDevice device) {

        if (VDBG) log("getState(" + device + ")");

        try {

            mServiceLock.readLock().lock();
@@ -386,7 +386,6 @@ public final class BluetoothHearingAid implements BluetoothProfile { 
     * @return false on immediate error, true otherwise

     * @hide

     */

    @UnsupportedAppUsage

    public boolean setActiveDevice(@Nullable BluetoothDevice device) {

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

        try {
@@ -418,7 +417,6 @@ public final class BluetoothHearingAid implements BluetoothProfile { 
     * @hide

     */

    @RequiresPermission(Manifest.permission.BLUETOOTH)

    @UnsupportedAppUsage

    public List<BluetoothDevice> getActiveDevices() {

        if (VDBG) log("getActiveDevices()");

        try {

framework/java/android/bluetooth/BluetoothProfile.java

+1 −1
Original line number Diff line number Diff line
@@ -276,7 +276,7 @@ public interface BluetoothProfile { 
     * #STATE_CONNECTING}, {@link #STATE_DISCONNECTED}, {@link #STATE_DISCONNECTING}

     */

    @RequiresPermission(Manifest.permission.BLUETOOTH)

    public int getConnectionState(BluetoothDevice device);

    @BtProfileState int getConnectionState(BluetoothDevice device);



    /**

     * An interface for notifying BluetoothProfile IPC clients when they have