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

Commit 6fa52c9b authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Add @NonNull annotations to Hearing Aids Profile APIs"

parents 442084c7 9d37667f

api/current.txt

+3 −3
Original line number Diff line number Diff line
@@ -8390,9 +8390,9 @@ package android.bluetooth { 
  }















  public final class BluetoothHearingAid implements android.bluetooth.BluetoothProfile {













    method public java.util.List<android.bluetooth.BluetoothDevice> getConnectedDevices();













    method public int getConnectionState(android.bluetooth.BluetoothDevice);













    method public java.util.List<android.bluetooth.BluetoothDevice> getDevicesMatchingConnectionStates(int[]);













    method @NonNull public java.util.List<android.bluetooth.BluetoothDevice> getConnectedDevices();













    method public int getConnectionState(@NonNull android.bluetooth.BluetoothDevice);













    method @NonNull public java.util.List<android.bluetooth.BluetoothDevice> getDevicesMatchingConnectionStates(@NonNull int[]);















    field public static final String ACTION_CONNECTION_STATE_CHANGED = "android.bluetooth.hearingaid.profile.action.CONNECTION_STATE_CHANGED";















  }







































core/java/android/bluetooth/BluetoothHearingAid.java



+5
−4




























Original line number
Diff line number
Diff line








@@ -17,6 +17,7 @@













package android.bluetooth;































import android.Manifest;













import android.annotation.NonNull;















import android.annotation.Nullable;















import android.annotation.RequiresPermission;















import android.annotation.SdkConstant;










@@ -302,7 +303,7 @@ public final class BluetoothHearingAid implements BluetoothProfile {













     * {@inheritDoc}















     */















    @Override













    public List<BluetoothDevice> getConnectedDevices() {













    public @NonNull List<BluetoothDevice> getConnectedDevices() {















        if (VDBG) log("getConnectedDevices()");















        try {















            mServiceLock.readLock().lock();









@@ -322,8 +323,8 @@ public final class BluetoothHearingAid implements BluetoothProfile {













    /**















     * {@inheritDoc}















     */













    @Override













    public List<BluetoothDevice> getDevicesMatchingConnectionStates(int[] states) {













    @Override public @NonNull List<BluetoothDevice> getDevicesMatchingConnectionStates(













    @NonNull int[] states) {















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















        try {















            mServiceLock.readLock().lock();









@@ -344,7 +345,7 @@ public final class BluetoothHearingAid implements BluetoothProfile {













     * {@inheritDoc}















     */















    @Override













    public int getConnectionState(BluetoothDevice device) {













    public int getConnectionState(@NonNull BluetoothDevice device) {















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















        try {















            mServiceLock.readLock().lock();