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

Revert "Added a new network capability MMTEL" am: bcfe8037e2 am: 39beeb7b45

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1928147

Change-Id: I407ff85f69cd0a931d8d0c45b336f83b8dcbb062
This commit is contained in:
Martijn Coenen
2021-12-21 11:41:43 +00:00
committed by Automerger Merge Worker
parent 764e5d7fae 39beeb7b45
commit 7992c40489
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_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);

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

@@ -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 { }