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

Commit 18b50077 authored by Xin Li's avatar Xin Li
Browse files

Merge ab/7061308 into stage. 

Bug: 180401296
Merged-In: I4bf82035631ccff6d5a6144d6d9b1d203b076851
Change-Id: I1b5f3a672a55eaabba0f5389bab110b395553559
parents 9c5caaa9 baa3bef8

framework/java/android/bluetooth/BluetoothCodecStatus.java

+5 −4
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ package android.bluetooth; 


import android.annotation.Nullable;

import android.compat.annotation.UnsupportedAppUsage;

import android.os.Build;

import android.os.Parcel;

import android.os.Parcelable;
@@ -39,7 +40,7 @@ public final class BluetoothCodecStatus implements Parcelable { 
     * This extra represents the current codec status of the A2DP

     * profile.

     */

    @UnsupportedAppUsage

    @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553)

    public static final String EXTRA_CODEC_STATUS =

            "android.bluetooth.extra.CODEC_STATUS";
@@ -198,7 +199,7 @@ public final class BluetoothCodecStatus implements Parcelable { 
     *

     * @return the current codec configuration

     */

    @UnsupportedAppUsage

    @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553)

    public @Nullable BluetoothCodecConfig getCodecConfig() {

        return mCodecConfig;

    }
@@ -208,7 +209,7 @@ public final class BluetoothCodecStatus implements Parcelable { 
     *

     * @return an array with the codecs local capabilities

     */

    @UnsupportedAppUsage

    @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553)

    public @Nullable BluetoothCodecConfig[] getCodecsLocalCapabilities() {

        return mCodecsLocalCapabilities;

    }
@@ -218,7 +219,7 @@ public final class BluetoothCodecStatus implements Parcelable { 
     *

     * @return an array with the codecs selectable capabilities

     */

    @UnsupportedAppUsage

    @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553)

    public @Nullable BluetoothCodecConfig[] getCodecsSelectableCapabilities() {

        return mCodecsSelectableCapabilities;

    }