diff options
| author | 2021-12-21 12:29:53 +0000 | |
|---|---|---|
| committer | 2021-12-21 12:29:53 +0000 | |
| commit | c8de979930ab3c140211ed99bc0b35398bb586ff (patch) | |
| tree | e0440cf8aa41bae67a5be95624c279d6ce95a4b0 | |
| parent | 3605f5913129ae3bc6ec88e675b0fb396849b697 (diff) | |
| parent | 8e2325ad420828d24a626147f5be086ecf5a7070 (diff) | |
Revert "Added a new network capability MMTEL" am: bcfe8037e2 am: 39beeb7b45 am: 7992c40489 am: 8e2325ad42
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1928147
Change-Id: I80959a07d7b7a9a0e7065887da6d180f588c6cb9
| -rw-r--r-- | core/java/android/net/vcn/VcnGatewayConnectionConfig.java | 2 | ||||
| -rw-r--r-- | telephony/java/android/telephony/Annotation.java | 1 |
2 files changed, 0 insertions, 3 deletions
diff --git a/core/java/android/net/vcn/VcnGatewayConnectionConfig.java b/core/java/android/net/vcn/VcnGatewayConnectionConfig.java index 39b5e7b3daa3..55d3ecd2c92f 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 0a4fa5d2a16b..e88106cb95fe 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 { } |