Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "Added a new network capability MMTEL"

Browse Source 
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
This commit is contained in:
Martijn Coenen
2021-12-21 11:24:01 +00:00
parent f705cb8db6
commit bcfe8037e2
2 changed files with 0 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/java/android/net/vcn/VcnGatewayConnectionConfig.java
View File

@@ -74,7 +74,6 @@ import java.util.concurrent.TimeUnit;
* <li>{@link NetworkCapabilities#NET_CAPABILITY_CBS} * <li>{@link NetworkCapabilities#NET_CAPABILITY_CBS}
* <li>{@link NetworkCapabilities#NET_CAPABILITY_IA} * <li>{@link NetworkCapabilities#NET_CAPABILITY_IA}
* <li>{@link NetworkCapabilities#NET_CAPABILITY_RCS} * <li>{@link NetworkCapabilities#NET_CAPABILITY_RCS}
* <li>{@link NetworkCapabilities#NET_CAPABILITY_MMTEL}
* <li>{@link NetworkCapabilities#NET_CAPABILITY_XCAP} * <li>{@link NetworkCapabilities#NET_CAPABILITY_XCAP}
* <li>{@link NetworkCapabilities#NET_CAPABILITY_EIMS} * <li>{@link NetworkCapabilities#NET_CAPABILITY_EIMS}
* <li>{@link NetworkCapabilities#NET_CAPABILITY_INTERNET} * <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_CBS);
allowedCaps.add(NetworkCapabilities.NET_CAPABILITY_IA); allowedCaps.add(NetworkCapabilities.NET_CAPABILITY_IA);
allowedCaps.add(NetworkCapabilities.NET_CAPABILITY_RCS); allowedCaps.add(NetworkCapabilities.NET_CAPABILITY_RCS);
allowedCaps.add(NetworkCapabilities.NET_CAPABILITY_MMTEL);
allowedCaps.add(NetworkCapabilities.NET_CAPABILITY_XCAP); allowedCaps.add(NetworkCapabilities.NET_CAPABILITY_XCAP);
allowedCaps.add(NetworkCapabilities.NET_CAPABILITY_EIMS); allowedCaps.add(NetworkCapabilities.NET_CAPABILITY_EIMS);
allowedCaps.add(NetworkCapabilities.NET_CAPABILITY_INTERNET); allowedCaps.add(NetworkCapabilities.NET_CAPABILITY_INTERNET);

1
telephony/java/android/telephony/Annotation.java
View File

@@ -707,7 +707,6 @@ public class Annotation {
NetworkCapabilities.NET_CAPABILITY_VSIM, NetworkCapabilities.NET_CAPABILITY_VSIM,
NetworkCapabilities.NET_CAPABILITY_BIP, NetworkCapabilities.NET_CAPABILITY_BIP,
NetworkCapabilities.NET_CAPABILITY_HEAD_UNIT, NetworkCapabilities.NET_CAPABILITY_HEAD_UNIT,
NetworkCapabilities.NET_CAPABILITY_MMTEL,
}) })
public @interface NetCapability { } public @interface NetCapability { }