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

Commit 7a3d7a25 authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Snap for 8492734 from 215a9c33 to tm-qpr1-release

Change-Id: Ide2994b7248021b2467eccc5b1e9388f949cccd6
parents 97399d8a 215a9c33
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -185,7 +185,7 @@ public class LeAudioService extends ProfileService {
    }

    public static boolean isEnabled() {
        return BluetoothProperties.isProfileBapUnicastServerEnabled().orElse(false);
        return BluetoothProperties.isProfileBapUnicastClientEnabled().orElse(false);
    }

    @Override
+1 −1
Original line number Diff line number Diff line
@@ -56,7 +56,7 @@ public class TbsService extends ProfileService {
    private final TbsGeneric mTbsGeneric = new TbsGeneric();

    public static boolean isEnabled() {
        return BluetoothProperties.isProfileTbsServerEnabled().orElse(false);
        return BluetoothProperties.isProfileCcpServerEnabled().orElse(false);
    }

    @Override
+1 −1
Original line number Diff line number Diff line
@@ -186,7 +186,7 @@ public class VolumeControlService extends ProfileService {
    private final ServiceFactory mFactory = new ServiceFactory();

    public static boolean isEnabled() {
        return BluetoothProperties.isProfileVcServerEnabled().orElse(false);
        return BluetoothProperties.isProfileVcpControllerEnabled().orElse(false);
    }

    @Override
+18 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@
package android.bluetooth;

import android.annotation.NonNull;
import android.annotation.Nullable;
import android.annotation.SystemApi;
import android.bluetooth.BluetoothUtils.TypeValueEntry;
import android.os.Parcel;
@@ -24,7 +25,9 @@ import android.os.Parcelable;

import java.nio.ByteBuffer;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.Objects;

/**
 * A class representing the codec specific config metadata information defined in the Basic Audio
@@ -44,6 +47,21 @@ public final class BluetoothLeAudioCodecConfigMetadata implements Parcelable {
        mRawMetadata = rawMetadata;
    }

    @Override
    public boolean equals(@Nullable Object o) {
        if (o != null && o instanceof BluetoothLeAudioCodecConfigMetadata) {
            final BluetoothLeAudioCodecConfigMetadata oth = (BluetoothLeAudioCodecConfigMetadata) o;
            return mAudioLocation == oth.getAudioLocation()
                && Arrays.equals(mRawMetadata, oth.getRawMetadata());
        }
        return false;
    }

    @Override
    public int hashCode() {
        return Objects.hash(mAudioLocation, mRawMetadata);
    }

    /**
     * Get the audio location information as defined in the Generic Audio section of Bluetooth
     * Assigned numbers.