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

Commit 8d808e5c authored by Rahul Sabnis's avatar Rahul Sabnis Committed by android-build-merger
Browse files

Merge "Resolve BluetoothHearingAid API usages by Settings" 

am: 24dd49bb

Change-Id: Iab058a5e869d6b25b5d256b1f6c0ee5fcedc1c1e
parents 10b567fe 24dd49bb

framework/java/android/bluetooth/BluetoothHearingAid.java

+4 −3
Original line number Diff line number Diff line
@@ -335,9 +335,9 @@ public final class BluetoothHearingAid implements BluetoothProfile { 
     * is not active, it will be null on that position. Returns empty list on error.

     * @hide

     */

    @UnsupportedAppUsage

    @SystemApi

    @RequiresPermission(Manifest.permission.BLUETOOTH)

    public List<BluetoothDevice> getActiveDevices() {

    public @NonNull List<BluetoothDevice> getActiveDevices() {

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

        final IBluetoothHearingAid service = getService();

        try {
@@ -559,8 +559,9 @@ public final class BluetoothHearingAid implements BluetoothProfile { 
     * @return the CustomerId of the device

     * @hide

     */

    @SystemApi

    @RequiresPermission(Manifest.permission.BLUETOOTH)

    public long getHiSyncId(BluetoothDevice device) {

    public long getHiSyncId(@Nullable BluetoothDevice device) {

        if (VDBG) {

            log("getCustomerId(" + device + ")");

        }