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

Commit 298c0ac4 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Fix checkstyle in frameworks" am: c7dcb096 am: 25a2ad4f am: b12b703a 

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/2206215



Change-Id: Iea6314081342b9898906508f2b5699cabca3ce06
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 2ba2deff b12b703a

framework/java/android/bluetooth/Attributable.java

+3 −0
Original line number Diff line number Diff line
@@ -30,8 +30,10 @@ import java.util.List; 
 * @hide

 */

public interface Attributable {

    /** @hide */

    void setAttributionSource(@NonNull AttributionSource attributionSource);



    /** @hide */

    static @Nullable <T extends Attributable> T setAttributionSource(

            @Nullable T attributable,

            @NonNull AttributionSource attributionSource) {
@@ -41,6 +43,7 @@ public interface Attributable { 
        return attributable;

    }



    /** @hide */

    static @Nullable <T extends Attributable> List<T> setAttributionSource(

            @Nullable List<T> attributableList,

            @NonNull AttributionSource attributionSource) {

framework/java/android/bluetooth/BluetoothA2dp.java

+4 −2
Original line number Diff line number Diff line
@@ -941,7 +941,8 @@ public final class BluetoothA2dp implements BluetoothProfile { 
            android.Manifest.permission.BLUETOOTH_CONNECT,

            android.Manifest.permission.BLUETOOTH_PRIVILEGED,

    })

    public @OptionalCodecsSupportStatus int isOptionalCodecsSupported(

    @OptionalCodecsSupportStatus

    public int isOptionalCodecsSupported(

            @NonNull BluetoothDevice device) {

        if (DBG) log("isOptionalCodecsSupported(" + device + ")");

        verifyDeviceNotNull(device, "isOptionalCodecsSupported");
@@ -978,7 +979,8 @@ public final class BluetoothA2dp implements BluetoothProfile { 
            android.Manifest.permission.BLUETOOTH_CONNECT,

            android.Manifest.permission.BLUETOOTH_PRIVILEGED,

    })

    public @OptionalCodecsPreferenceStatus int isOptionalCodecsEnabled(

    @OptionalCodecsPreferenceStatus

    public int isOptionalCodecsEnabled(

            @NonNull BluetoothDevice device) {

        if (DBG) log("isOptionalCodecsEnabled(" + device + ")");

        verifyDeviceNotNull(device, "isOptionalCodecsEnabled");

framework/java/android/bluetooth/BluetoothAdapter.java

+4 −3
Original line number Diff line number Diff line
@@ -1035,7 +1035,8 @@ public final class BluetoothAdapter { 
     * @throws IllegalArgumentException if address is invalid

     */

    @RequiresNoPermission

    public @NonNull BluetoothDevice getRemoteLeDevice(@NonNull String address,

    @NonNull

    public BluetoothDevice getRemoteLeDevice(@NonNull String address,

            @AddressType int addressType) {

        final BluetoothDevice res = new BluetoothDevice(address, addressType);

        res.setAttributionSource(mAttributionSource);

framework/java/android/bluetooth/BluetoothAudioConfig.java

+12 −12
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 


package android.bluetooth;



import android.annotation.NonNull;

import android.annotation.Nullable;

import android.os.Parcel;

import android.os.Parcelable;
@@ -65,8 +66,7 @@ public final class BluetoothAudioConfig implements Parcelable { 
        return 0;

    }



    public static final @android.annotation.NonNull Parcelable.Creator<BluetoothAudioConfig> CREATOR =

            new Parcelable.Creator<BluetoothAudioConfig>() {

    public static final @NonNull Creator<BluetoothAudioConfig> CREATOR = new Creator<>() {

        public BluetoothAudioConfig createFromParcel(Parcel in) {

            int sampleRate = in.readInt();

            int channelConfig = in.readInt();

framework/java/android/bluetooth/BluetoothAvrcpPlayerSettings.java

+2 −2
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 


package android.bluetooth;



import android.annotation.NonNull;

import android.os.Parcel;

import android.os.Parcelable;

import android.util.Log;
@@ -118,8 +119,7 @@ public final class BluetoothAvrcpPlayerSettings implements Parcelable { 
        }

    }



    public static final @android.annotation.NonNull Parcelable.Creator<BluetoothAvrcpPlayerSettings> CREATOR =

            new Parcelable.Creator<BluetoothAvrcpPlayerSettings>() {

    public static final @NonNull Creator<BluetoothAvrcpPlayerSettings> CREATOR = new Creator<>() {

        public BluetoothAvrcpPlayerSettings createFromParcel(Parcel in) {

            return new BluetoothAvrcpPlayerSettings(in);

        }