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

Commit e52b8c57 authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Snap for 5364434 from 1f71a6a273f7602b849e83d82eeb05edccb85fbe to qt-release 

Change-Id: Ib8314c9deb52cfb962734121669b4c241bbeb117
parents 8009e3a6 6fd9d8e3

framework/java/android/bluetooth/BluetoothCodecStatus.java

+2 −2
Original line number Diff line number Diff line
@@ -75,7 +75,7 @@ public final class BluetoothCodecStatus implements Parcelable { 
     * @param c2 the second array of capabilities to compare

     * @return true if both arrays contain same capabilities

     */

    private static boolean sameCapabilities(BluetoothCodecConfig[] c1,

    public static boolean sameCapabilities(BluetoothCodecConfig[] c1,

                                           BluetoothCodecConfig[] c2) {

        if (c1 == null) {

            return (c2 == null);

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;
@@ -303,7 +304,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();
@@ -323,8 +324,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();
@@ -345,7 +346,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();