Merge TP1A.220225.003

Change-Id: Id71ac466dbfe3707fe2e544ce22b1da8f474ec2b

1 files changed, 2 insertions, 2 deletions

diff --git a/framework/java/android/bluetooth/BluetoothLeAudioCodecConfig.java b/framework/java/android/bluetooth/BluetoothLeAudioCodecConfig.java
index e3f691a66a..8377c2c7d2 100644
--- a/framework/java/android/bluetooth/BluetoothLeAudioCodecConfig.java
+++ b/framework/java/android/bluetooth/BluetoothLeAudioCodecConfig.java
@@ -336,14 +336,14 @@ public final class BluetoothLeAudioCodecConfig implements Parcelable {
     /**
      * Returns the frame duration.
      */
-    public @ChannelMode int getFrameDuration() {
+    public @FrameDuration int getFrameDuration() {
         return mFrameDuration;
     }
 
     /**
      * Returns the octets per frame
      */
-    public @ChannelMode int getOctetsPerFrame() {
+    public int getOctetsPerFrame() {
         return mOctetsPerFrame;
     }