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

Commit 6ab83e62 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge changes from topic "mmtel_capability" am: 4b07c1b4 

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

Change-Id: Ie0723975ddc1b92939b3981996456a8e07b1c401
parents 10494575 4b07c1b4

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

+2 −0
Original line number Diff line number Diff line
@@ -74,6 +74,7 @@ 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}
@@ -102,6 +103,7 @@ 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

+1 −0
Original line number Diff line number Diff line
@@ -707,6 +707,7 @@ public class Annotation { 
            NetworkCapabilities.NET_CAPABILITY_VSIM,

            NetworkCapabilities.NET_CAPABILITY_BIP,

            NetworkCapabilities.NET_CAPABILITY_HEAD_UNIT,

            NetworkCapabilities.NET_CAPABILITY_MMTEL,

    })

    public @interface NetCapability { }