commit 23732647159cb81ae140b6d82dd5d751c1071be9
author Martijn Coenen <maco@google.com> Tue Dec 21 11:27:16 2021 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Dec 21 11:27:16 2021 +0000
tree cc1271c3c476d12c9aaa9b08c2cfea9c61c69896
parent 91661ba3b5c883062fd38d0967beacccc7be492f
parent 0de46b2b44fa2efccf37a922e11d697117041ce5

Merge "Revert "Added a new network capability MMTEL""

staticlibs/framework/com/android/net/module/util/NetworkCapabilitiesUtils.java

diff --git a/staticlibs/framework/com/android/net/module/util/NetworkCapabilitiesUtils.java b/staticlibs/framework/com/android/net/module/util/NetworkCapabilitiesUtils.java
index 9a1c5fd..d6222a7 100644
--- a/staticlibs/framework/com/android/net/module/util/NetworkCapabilitiesUtils.java
+++ b/staticlibs/framework/com/android/net/module/util/NetworkCapabilitiesUtils.java
@@ -27,7 +27,6 @@
 import static android.net.NetworkCapabilities.NET_CAPABILITY_INTERNET;
 import static android.net.NetworkCapabilities.NET_CAPABILITY_MCX;
 import static android.net.NetworkCapabilities.NET_CAPABILITY_MMS;
-import static android.net.NetworkCapabilities.NET_CAPABILITY_MMTEL;
 import static android.net.NetworkCapabilities.NET_CAPABILITY_OEM_PAID;
 import static android.net.NetworkCapabilities.NET_CAPABILITY_OEM_PRIVATE;
 import static android.net.NetworkCapabilities.NET_CAPABILITY_RCS;
@@ -98,8 +97,7 @@
             | (1 << NET_CAPABILITY_RCS)
             | (1 << NET_CAPABILITY_VEHICLE_INTERNAL)
             | (1 << NET_CAPABILITY_VSIM)
-            | (1 << NET_CAPABILITY_XCAP)
-            | (1L << NET_CAPABILITY_MMTEL);
+            | (1 << NET_CAPABILITY_XCAP);
 
     /**
      * Capabilities that force network to be restricted.