Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 39beeb7b authored by Martijn Coenen's avatar Martijn Coenen Committed by Automerger Merge Worker
Browse files

Revert "Added a new network capability MMTEL" am: bcfe8037 

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

Change-Id: I6057a67c41d0a9fd114a2b5696ad415d20623238
parents 6ab83e62 bcfe8037

core/java/android/net/vcn/VcnGatewayConnectionConfig.java

+0 −2
Original line number Diff line number Diff line
@@ -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);

telephony/java/android/telephony/Annotation.java

+0 −1
Original line number Diff line number Diff line
@@ -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 { }