From bcfe8037e203ccf427d83c0e24f0784727b5952f Mon Sep 17 00:00:00 2001
From: Martijn Coenen <maco@google.com>
Date: Tue, 21 Dec 2021 11:24:01 +0000
Subject: [PATCH] Revert "Added a new network capability MMTEL"

Revert "Added a new network capability MMTEL"

Revert submission 1927643-mmtel_capability

Reason for revert: b/211586152
Reverted Changes:
Ifea8b1e40:Added a new network capability MMTEL
I38655bef2:Added a new network capability MMTEL
I837606d9e:Added setup/tear down data support
I2c7b291fe:Added a new network capability MMTEL

Change-Id: Ifd818ba06bc8c6a10bf0393243443d049e5d7503
---
 core/java/android/net/vcn/VcnGatewayConnectionConfig.java | 2 --
 telephony/java/android/telephony/Annotation.java          | 1 -
 2 files changed, 3 deletions(-)

diff --git a/core/java/android/net/vcn/VcnGatewayConnectionConfig.java b/core/java/android/net/vcn/VcnGatewayConnectionConfig.java
index 39b5e7b3daa3b..55d3ecd2c92fe 100644
--- a/core/java/android/net/vcn/VcnGatewayConnectionConfig.java
+++ b/core/java/android/net/vcn/VcnGatewayConnectionConfig.java
@@ -74,7 +74,6 @@ import java.util.concurrent.TimeUnit;
  *   <li>{@link NetworkCapabilities#NET_CAPABILITY_CBS}
  *   <li>{@link NetworkCapabilities#NET_CAPABILITY_IA}
  *   <li>{@link NetworkCapabilities#NET_CAPABILITY_RCS}
- *   <li>{@link NetworkCapabilities#NET_CAPABILITY_MMTEL}
  *   <li>{@link NetworkCapabilities#NET_CAPABILITY_XCAP}
  *   <li>{@link NetworkCapabilities#NET_CAPABILITY_EIMS}
  *   <li>{@link NetworkCapabilities#NET_CAPABILITY_INTERNET}
@@ -103,7 +102,6 @@ public final class VcnGatewayConnectionConfig {
         allowedCaps.add(NetworkCapabilities.NET_CAPABILITY_CBS);
         allowedCaps.add(NetworkCapabilities.NET_CAPABILITY_IA);
         allowedCaps.add(NetworkCapabilities.NET_CAPABILITY_RCS);
-        allowedCaps.add(NetworkCapabilities.NET_CAPABILITY_MMTEL);
         allowedCaps.add(NetworkCapabilities.NET_CAPABILITY_XCAP);
         allowedCaps.add(NetworkCapabilities.NET_CAPABILITY_EIMS);
         allowedCaps.add(NetworkCapabilities.NET_CAPABILITY_INTERNET);
diff --git a/telephony/java/android/telephony/Annotation.java b/telephony/java/android/telephony/Annotation.java
index 0a4fa5d2a16b3..e88106cb95fe4 100644
--- a/telephony/java/android/telephony/Annotation.java
+++ b/telephony/java/android/telephony/Annotation.java
@@ -707,7 +707,6 @@ public class Annotation {
             NetworkCapabilities.NET_CAPABILITY_VSIM,
             NetworkCapabilities.NET_CAPABILITY_BIP,
             NetworkCapabilities.NET_CAPABILITY_HEAD_UNIT,
-            NetworkCapabilities.NET_CAPABILITY_MMTEL,
     })
     public @interface NetCapability { }