commit 88c05c03f2fcd469188a79a4a19a308628e68016
author Grace Jia <xiaotonj@google.com> Thu Feb 17 21:32:21 2022 +0000
committer Grace Jia <xiaotonj@google.com> Mon Feb 28 19:32:43 2022 +0000
tree 7febd1cd8af4e325bb92199e217423fac88b8955
parent f5170f4876b5ac5d761f32cbdf519587fdf2a0ec

Revert "Add API for external call audio route."

Revert "Add CTS coverage for new external audio route API."

Revert submission 16308028-external-audio

Reason for revert: Don't want to launch this in T now
Reverted Changes:
I6634c752a:Add CTS coverage for new external audio route API....
Ibd1c2880e:Add API for external call audio route.
I3e262a913:Implement new external audio route.

Change-Id: I3a3eab1151b825523499058040c14696ea2887e9

telecomm/java/android/telecom/CallAudioState.java

diff --git a/telecomm/java/android/telecom/CallAudioState.java b/telecomm/java/android/telecom/CallAudioState.java
index 389df80..fccdf76 100644
--- a/telecomm/java/android/telecom/CallAudioState.java
+++ b/telecomm/java/android/telecom/CallAudioState.java
@@ -27,6 +27,7 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
@@ -41,8 +42,7 @@
 public final class CallAudioState implements Parcelable {
     /** @hide */
     @Retention(RetentionPolicy.SOURCE)
-    @IntDef(value = {ROUTE_EARPIECE, ROUTE_BLUETOOTH, ROUTE_WIRED_HEADSET, ROUTE_SPEAKER,
-            ROUTE_EXTERNAL},
+    @IntDef(value={ROUTE_EARPIECE, ROUTE_BLUETOOTH, ROUTE_WIRED_HEADSET, ROUTE_SPEAKER},
             flag=true)
     public @interface CallAudioRoute {}
 
@@ -58,9 +58,6 @@
     /** Direct the audio stream through the device's speakerphone. */
     public static final int ROUTE_SPEAKER       = 0x00000008;
 
-    /** Direct the audio stream through another device. */
-    public static final int ROUTE_EXTERNAL       = 0x00000010;
-
     /**
      * Direct the audio stream through the device's earpiece or wired headset if one is
      * connected.
@@ -73,7 +70,7 @@
      * @hide
      **/
     public static final int ROUTE_ALL = ROUTE_EARPIECE | ROUTE_BLUETOOTH | ROUTE_WIRED_HEADSET |
-            ROUTE_SPEAKER | ROUTE_EXTERNAL;
+            ROUTE_SPEAKER;
 
     private final boolean isMuted;
     private final int route;
@@ -192,11 +189,7 @@
      */
     @CallAudioRoute
     public int getSupportedRouteMask() {
-        if (route == ROUTE_EXTERNAL) {
-            return ROUTE_EXTERNAL;
-        } else {
-            return supportedRouteMask;
-        }
+        return supportedRouteMask;
     }
 
     /**
@@ -240,10 +233,6 @@
             listAppend(buffer, "SPEAKER");
         }
 
-        if ((route & ROUTE_EXTERNAL) == ROUTE_EXTERNAL) {
-            listAppend(buffer, "EXTERNAL");
-        }
-
         return buffer.toString();
     }