Change Audio codec mode to use bitmask

Add implementation of CMR(Codec Mode Request)

Bug: 244517604
Test: test with device, ImsMediaTestingApp
Change-Id: I63535d2860b74a25f2ede2dfa518b25095e1cf8e

2 files changed, 33 insertions, 33 deletions

diff --git a/framework/src/android/telephony/imsmedia/AmrParams.java b/framework/src/android/telephony/imsmedia/AmrParams.java
index 7e09f55e..d735a04f 100644
--- a/framework/src/android/telephony/imsmedia/AmrParams.java
+++ b/framework/src/android/telephony/imsmedia/AmrParams.java
@@ -17,11 +17,11 @@
 package android.telephony.imsmedia;
 
 import android.annotation.IntDef;
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
 import android.os.Parcel;
 import android.os.Parcelable;
-import android.os.ParcelFileDescriptor;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
@@ -34,23 +34,23 @@ import java.util.Objects;
  */
 public final class AmrParams implements Parcelable {
     /** 4.75 kbps for AMR / 6.6 kbps for AMR-WB */
-    public static final int AMR_MODE_0 = 0;
+    public static final int AMR_MODE_0 = 1 << 0;
     /** 5.15 kbps for AMR / 8.855 kbps for AMR-WB */
-    public static final int AMR_MODE_1 = 1;
+    public static final int AMR_MODE_1 = 1 << 1;
     /** 5.9 kbps for AMR / 12.65 kbps for AMR-WB */
-    public static final int AMR_MODE_2 = 2;
+    public static final int AMR_MODE_2 = 1 << 2;
     /** 6.7 kbps for AMR / 14.25 kbps for AMR-WB */
-    public static final int AMR_MODE_3 = 3;
+    public static final int AMR_MODE_3 = 1 << 3;
     /** 7.4 kbps for AMR / 15.85 kbps for AMR-WB */
-    public static final int AMR_MODE_4 = 4;
+    public static final int AMR_MODE_4 = 1 << 4;
     /** 7.95 kbps for AMR / 18.25 kbps for AMR-WB */
-    public static final int AMR_MODE_5 = 5;
+    public static final int AMR_MODE_5 = 1 << 5;
     /** 10.2 kbps for AMR / 19.85 kbps for AMR-WB */
-    public static final int AMR_MODE_6 = 6;
+    public static final int AMR_MODE_6 = 1 << 6;
     /** 12.2 kbps for AMR / 23.05 kbps for AMR-WB */
-    public static final int AMR_MODE_7 = 7;
+    public static final int AMR_MODE_7 = 1 << 7;
     /** Silence frame for AMR / 23.85 kbps for AMR-WB */
-    public static final int AMR_MODE_8 = 8;
+    public static final int AMR_MODE_8 = 1 << 8;
 
     /** @hide */
     @IntDef(
diff --git a/framework/src/android/telephony/imsmedia/EvsParams.java b/framework/src/android/telephony/imsmedia/EvsParams.java
index 25800122..54e05032 100644
--- a/framework/src/android/telephony/imsmedia/EvsParams.java
+++ b/framework/src/android/telephony/imsmedia/EvsParams.java
@@ -57,47 +57,47 @@ public final class EvsParams implements Parcelable {
     public @interface EvsBandwidth {}
 
     /** 6.6 kbps for EVS AMR-WB IO */
-    public static final int EVS_MODE_0 = 0;
+    public static final int EVS_MODE_0 = 1 << 0;
     /** 8.855 kbps for AMR-WB IO */
-    public static final int EVS_MODE_1 = 1;
+    public static final int EVS_MODE_1 = 1 << 1;
     /** 12.65 kbps for AMR-WB IO */
-    public static final int EVS_MODE_2 = 2;
+    public static final int EVS_MODE_2 = 1 << 2;
     /** 14.25 kbps for AMR-WB IO */
-    public static final int EVS_MODE_3 = 3;
+    public static final int EVS_MODE_3 = 1 << 3;
     /** 15.85 kbps for AMR-WB IO */
-    public static final int EVS_MODE_4 = 4;
+    public static final int EVS_MODE_4 = 1 << 4;
     /** 18.25 kbps for AMR-WB IO */
-    public static final int EVS_MODE_5 = 5;
+    public static final int EVS_MODE_5 = 1 << 5;
     /** 19.85 kbps for AMR-WB IO */
-    public static final int EVS_MODE_6 = 6;
+    public static final int EVS_MODE_6 = 1 << 6;
     /** 23.05 kbps for AMR-WB IO */
-    public static final int EVS_MODE_7 = 7;
+    public static final int EVS_MODE_7 = 1 << 7;
     /** 23.85 kbps for AMR-WB IO */
-    public static final int EVS_MODE_8 = 8;
+    public static final int EVS_MODE_8 = 1 << 8;
     /** 5.9 kbps for EVS primary */
-    public static final int EVS_MODE_9 = 9;
+    public static final int EVS_MODE_9 = 1 << 9;
     /** 7.2 kbps for EVS primary */
-    public static final int EVS_MODE_10 = 10;
+    public static final int EVS_MODE_10 = 1 << 10;
     /** 8.0 kbps for EVS primary */
-    public static final int EVS_MODE_11 = 11;
+    public static final int EVS_MODE_11 = 1 << 11;
     /** 9.6 kbps for EVS primary */
-    public static final int EVS_MODE_12 = 12;
+    public static final int EVS_MODE_12 = 1 << 12;
     /** 13.2 kbps for EVS primary */
-    public static final int EVS_MODE_13 = 13;
+    public static final int EVS_MODE_13 = 1 << 13;
     /** 16.4 kbps for EVS primary */
-    public static final int EVS_MODE_14 = 14;
+    public static final int EVS_MODE_14 = 1 << 14;
     /** 24.4 kbps for EVS primary */
-    public static final int EVS_MODE_15 = 15;
+    public static final int EVS_MODE_15 = 1 << 15;
     /** 32.0 kbps for EVS primary */
-    public static final int EVS_MODE_16 = 16;
+    public static final int EVS_MODE_16 = 1 << 16;
     /** 48.0 kbps for EVS primary */
-    public static final int EVS_MODE_17 = 17;
+    public static final int EVS_MODE_17 = 1 << 17;
     /** 64.0 kbps for EVS primary */
-    public static final int EVS_MODE_18 = 18;
+    public static final int EVS_MODE_18 = 1 << 18;
     /** 96.0 kbps for EVS primary */
-    public static final int EVS_MODE_19 = 19;
+    public static final int EVS_MODE_19 = 1 << 19;
     /** 128.0 kbps for EVS primary */
-    public static final int EVS_MODE_20 = 20;
+    public static final int EVS_MODE_20 = 1 << 20;
 
     /** @hide */
     @IntDef(