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

4 files changed, 5 insertions, 38 deletions

diff --git a/core/api/current.txt b/core/api/current.txt
index 698c1ce93f70..390a6e195576 100644
--- a/core/api/current.txt
+++ b/core/api/current.txt
@@ -40020,7 +40020,6 @@ package android.telecom {
     field public static final int PROPERTY_NETWORK_IDENTIFIED_EMERGENCY_CALL = 2048; // 0x800
     field public static final int PROPERTY_RTT = 1024; // 0x400
     field public static final int PROPERTY_SELF_MANAGED = 256; // 0x100
-    field public static final int PROPERTY_TETHERED_CALL = 32768; // 0x8000
     field public static final int PROPERTY_VOIP_AUDIO_MODE = 4096; // 0x1000
     field public static final int PROPERTY_WIFI = 8; // 0x8
   }
@@ -40049,7 +40048,6 @@ package android.telecom {
     field @NonNull public static final android.os.Parcelable.Creator<android.telecom.CallAudioState> CREATOR;
     field public static final int ROUTE_BLUETOOTH = 2; // 0x2
     field public static final int ROUTE_EARPIECE = 1; // 0x1
-    field public static final int ROUTE_EXTERNAL = 16; // 0x10
     field public static final int ROUTE_SPEAKER = 8; // 0x8
     field public static final int ROUTE_WIRED_HEADSET = 4; // 0x4
     field public static final int ROUTE_WIRED_OR_EARPIECE = 5; // 0x5
@@ -40324,7 +40322,6 @@ package android.telecom {
     field public static final int PROPERTY_IS_RTT = 256; // 0x100
     field public static final int PROPERTY_NETWORK_IDENTIFIED_EMERGENCY_CALL = 1024; // 0x400
     field public static final int PROPERTY_SELF_MANAGED = 128; // 0x80
-    field public static final int PROPERTY_TETHERED_CALL = 16384; // 0x4000
     field public static final int PROPERTY_WIFI = 8; // 0x8
     field public static final int STATE_ACTIVE = 4; // 0x4
     field public static final int STATE_DIALING = 3; // 0x3
diff --git a/telecomm/java/android/telecom/Call.java b/telecomm/java/android/telecom/Call.java
index ce9530c196ef..d94fafc6a5bf 100644
--- a/telecomm/java/android/telecom/Call.java
+++ b/telecomm/java/android/telecom/Call.java
@@ -701,15 +701,8 @@ public final class Call {
          */
         public static final int PROPERTY_CROSS_SIM = 0x00004000;
 
-        /**
-         * Connection is a tethered external call.
-         * Indicates that the {@link Connection} is fixed on this device but the audio streams are
-         * re-routed to another device.
-         */
-        public static final int PROPERTY_TETHERED_CALL = 0x00008000;
-
         //******************************************************************************************
-        // Next PROPERTY value: 0x00010000
+        // Next PROPERTY value: 0x00004000
         //******************************************************************************************
 
         private final @CallState int mState;
@@ -906,9 +899,6 @@ public final class Call {
             if (hasProperty(properties, PROPERTY_CROSS_SIM)) {
                 builder.append(" PROPERTY_CROSS_SIM");
             }
-            if (hasProperty(properties, PROPERTY_TETHERED_CALL)) {
-                builder.append(" PROPERTY_TETHERED_CALL");
-            }
             builder.append("]");
             return builder.toString();
         }
diff --git a/telecomm/java/android/telecom/CallAudioState.java b/telecomm/java/android/telecom/CallAudioState.java
index 389df80497df..fccdf76372dd 100644
--- a/telecomm/java/android/telecom/CallAudioState.java
+++ b/telecomm/java/android/telecom/CallAudioState.java
@@ -27,6 +27,7 @@ import android.os.Parcelable;
 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 @@ import java.util.stream.Collectors;
 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 @@ public final class CallAudioState implements Parcelable {
     /** 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 @@ public final class CallAudioState implements Parcelable {
      * @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 @@ public final class CallAudioState implements Parcelable {
      */
     @CallAudioRoute
     public int getSupportedRouteMask() {
-        if (route == ROUTE_EXTERNAL) {
-            return ROUTE_EXTERNAL;
-        } else {
-            return supportedRouteMask;
-        }
+        return supportedRouteMask;
     }
 
     /**
@@ -240,10 +233,6 @@ public final class CallAudioState implements Parcelable {
             listAppend(buffer, "SPEAKER");
         }
 
-        if ((route & ROUTE_EXTERNAL) == ROUTE_EXTERNAL) {
-            listAppend(buffer, "EXTERNAL");
-        }
-
         return buffer.toString();
     }
 
diff --git a/telecomm/java/android/telecom/Connection.java b/telecomm/java/android/telecom/Connection.java
index 30d495942ece..21a180459978 100644
--- a/telecomm/java/android/telecom/Connection.java
+++ b/telecomm/java/android/telecom/Connection.java
@@ -561,15 +561,6 @@ public abstract class Connection extends Conferenceable {
      */
     public static final int PROPERTY_CROSS_SIM = 1 << 13;
 
-    /**
-     * Connection is a tethered external call.
-     * <p>
-     * Indicates that the {@link Connection} is fixed on this device but the audio streams are
-     * re-routed to another device.
-     * <p>
-     */
-    public static final int PROPERTY_TETHERED_CALL = 1 << 14;
-
     //**********************************************************************************************
     // Next PROPERTY value: 1<<14
     //**********************************************************************************************