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

Commit a76ec8b4 authored by Stanley Tng's avatar Stanley Tng
Browse files

Cleanup annontations for Hearing Aids Profile API 

Remove the @UnsupportedAppUsage and add the @IntDef for the Profile
Connection States in the Hearing Aids Profile API. Also, the parent
class BluetoothProfile has its Profile Connection States annontated.

Bug: 128523382
Test: Compile only
Change-Id: Ibd02516fa637ddb48d70a8dfacf607f047aec282
parent 4b7400c3

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;
@@ -91,7 +90,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";
@@ -323,7 +321,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 {
@@ -345,7 +344,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();
@@ -385,7 +385,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 {
@@ -417,7 +416,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

+14 −1
Original line number Diff line number Diff line
@@ -18,11 +18,14 @@ 
package android.bluetooth;



import android.Manifest;

import android.annotation.IntDef;

import android.annotation.RequiresPermission;

import android.annotation.SystemApi;

import android.annotation.UnsupportedAppUsage;

import android.os.Build;



import java.lang.annotation.Retention;

import java.lang.annotation.RetentionPolicy;

import java.util.List;



/**
@@ -60,6 +63,16 @@ public interface BluetoothProfile { 
    /** The profile is in disconnecting state */

    int STATE_DISCONNECTING = 3;



    /** @hide */

    @IntDef({

            STATE_DISCONNECTED,

            STATE_CONNECTING,

            STATE_CONNECTED,

            STATE_DISCONNECTING,

    })

    @Retention(RetentionPolicy.SOURCE)

    public @interface BtProfileState {}



    /**

     * Headset and Handsfree profile

     */
@@ -263,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