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

Commit 9887fb16 authored by Stanley Tng's avatar Stanley Tng Committed by android-build-merger
Browse files

Merge "Add @NonNull annotations to Hearing Aids Profile APIs" am: 6fa52c9b25 

am: b255f513

Change-Id: I50416d50c0723bbf33d83226c5536287096de75d
parents 43bafb87 b255f513

framework/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();