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

Commit 7ee0d055 authored by Xin Li's avatar Xin Li
Browse files

DO NOT MERGE - Merge Android 10 into master 

Bug: 139893257
Change-Id: I9e3c4fe5406c9913d50fe3b07d7f7cef7a246b96
parents 952f8ae2 17473255

framework/java/android/bluetooth/BluetoothA2dp.java

+2 −2
Original line number Diff line number Diff line
@@ -352,7 +352,7 @@ public final class BluetoothA2dp implements BluetoothProfile { 
     * {@inheritDoc}

     */

    @Override

    public int getConnectionState(BluetoothDevice device) {

    public @BtProfileState int getConnectionState(BluetoothDevice device) {

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

        try {

            final IBluetoothA2dp service = getService();
@@ -591,7 +591,7 @@ public final class BluetoothA2dp implements BluetoothProfile { 
     * @hide

     */

    @UnsupportedAppUsage

    public BluetoothCodecStatus getCodecStatus(BluetoothDevice device) {

    public @Nullable BluetoothCodecStatus getCodecStatus(BluetoothDevice device) {

        if (DBG) Log.d(TAG, "getCodecStatus(" + device + ")");

        try {

            final IBluetoothA2dp service = getService();

framework/java/android/bluetooth/BluetoothActivityEnergyInfo.java

+1 −1
Original line number Diff line number Diff line
@@ -76,7 +76,7 @@ public final class BluetoothActivityEnergyInfo implements Parcelable { 
                + " }";

    }



    public static final Parcelable.Creator<BluetoothActivityEnergyInfo> CREATOR =

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

            new Parcelable.Creator<BluetoothActivityEnergyInfo>() {

                public BluetoothActivityEnergyInfo createFromParcel(Parcel in) {

                    return new BluetoothActivityEnergyInfo(in);

framework/java/android/bluetooth/BluetoothAudioConfig.java

+1 −1
Original line number Diff line number Diff line
@@ -64,7 +64,7 @@ public final class BluetoothAudioConfig implements Parcelable { 
        return 0;

    }



    public static final Parcelable.Creator<BluetoothAudioConfig> CREATOR =

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

            new Parcelable.Creator<BluetoothAudioConfig>() {

                public BluetoothAudioConfig createFromParcel(Parcel in) {

                    int sampleRate = in.readInt();

framework/java/android/bluetooth/BluetoothAvrcpPlayerSettings.java

+1 −1
Original line number Diff line number Diff line
@@ -118,7 +118,7 @@ public final class BluetoothAvrcpPlayerSettings implements Parcelable { 
        }

    }



    public static final Parcelable.Creator<BluetoothAvrcpPlayerSettings> CREATOR =

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

            new Parcelable.Creator<BluetoothAvrcpPlayerSettings>() {

        public BluetoothAvrcpPlayerSettings createFromParcel(Parcel in) {

            return new BluetoothAvrcpPlayerSettings(in);

framework/java/android/bluetooth/BluetoothClass.java

+1 −1
Original line number Diff line number Diff line
@@ -94,7 +94,7 @@ public final class BluetoothClass implements Parcelable { 
        return 0;

    }



    public static final Parcelable.Creator<BluetoothClass> CREATOR =

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

            new Parcelable.Creator<BluetoothClass>() {

                public BluetoothClass createFromParcel(Parcel in) {

                    return new BluetoothClass(in.readInt());