From f705cb8db6e998592a5641c319ceec74a891af12 Mon Sep 17 00:00:00 2001
From: Jack Yu <jackyu@google.com>
Date: Thu, 16 Dec 2021 13:29:46 -0800
Subject: [PATCH] Added a new network capability MMTEL

Added NET_CAPABILITY_MMTEL to indicate a network
support MMTEL (Multimedia telephony). This is for
IMS service to request an IMS network that supports
voice or PS (VoPS for 4G, VoNR for 5G).

Bug: 210774375
Test: atest ConnectivityServiceTest
Change-Id: I2c7b291fee3450f588a282f7a252c183c374becf
(cherry picked from commit 1e6438b43a13c27d0f939ec417dc0a84597fe935)
---
 core/java/android/net/vcn/VcnGatewayConnectionConfig.java | 2 ++
 telephony/java/android/telephony/Annotation.java          | 1 +
 2 files changed, 3 insertions(+)

diff --git a/core/java/android/net/vcn/VcnGatewayConnectionConfig.java b/core/java/android/net/vcn/VcnGatewayConnectionConfig.java
index 55d3ecd2c92fe..39b5e7b3daa3b 100644
--- a/core/java/android/net/vcn/VcnGatewayConnectionConfig.java
+++ b/core/java/android/net/vcn/VcnGatewayConnectionConfig.java
@@ -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);
diff --git a/telephony/java/android/telephony/Annotation.java b/telephony/java/android/telephony/Annotation.java
index e88106cb95fe4..0a4fa5d2a16b3 100644
--- a/telephony/java/android/telephony/Annotation.java
+++ b/telephony/java/android/telephony/Annotation.java
@@ -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 { }