From 6ebc8ba59511c77745adee5cbb0150f8dc63abd9 Mon Sep 17 00:00:00 2001 From: Martijn Coenen Date: Tue, 21 Dec 2021 11:24:01 +0000 Subject: [PATCH] Revert "Added a new network capability MMTEL" Revert "Added setup/tear down data support" Revert "Added a new network capability MMTEL" Revert submission 1927643-mmtel_capability Reason for revert: b/211586152 Reverted Changes: Ifea8b1e40:Added a new network capability MMTEL I38655bef2:Added a new network capability MMTEL I837606d9e:Added setup/tear down data support I2c7b291fe:Added a new network capability MMTEL Change-Id: Ie9b0b0d9017ef8aea7fbb56dda522e7c433144b9 --- framework/api/current.txt | 1 - framework/src/android/net/NetworkCapabilities.java | 9 +-------- .../java/com/android/server/ConnectivityServiceTest.java | 4 +--- 3 files changed, 2 insertions(+), 12 deletions(-) diff --git a/framework/api/current.txt b/framework/api/current.txt index ad42ddeda8..9a77a3ced5 100644 --- a/framework/api/current.txt +++ b/framework/api/current.txt @@ -316,7 +316,6 @@ package android.net { field public static final int NET_CAPABILITY_INTERNET = 12; // 0xc field public static final int NET_CAPABILITY_MCX = 23; // 0x17 field public static final int NET_CAPABILITY_MMS = 0; // 0x0 - field public static final int NET_CAPABILITY_MMTEL = 33; // 0x21 field public static final int NET_CAPABILITY_NOT_CONGESTED = 20; // 0x14 field public static final int NET_CAPABILITY_NOT_METERED = 11; // 0xb field public static final int NET_CAPABILITY_NOT_RESTRICTED = 13; // 0xd diff --git a/framework/src/android/net/NetworkCapabilities.java b/framework/src/android/net/NetworkCapabilities.java index 721a12d0c6..03cf109256 100644 --- a/framework/src/android/net/NetworkCapabilities.java +++ b/framework/src/android/net/NetworkCapabilities.java @@ -274,7 +274,6 @@ public final class NetworkCapabilities implements Parcelable { NET_CAPABILITY_VSIM, NET_CAPABILITY_BIP, NET_CAPABILITY_HEAD_UNIT, - NET_CAPABILITY_MMTEL, }) public @interface NetCapability { } @@ -513,13 +512,8 @@ public final class NetworkCapabilities implements Parcelable { */ public static final int NET_CAPABILITY_HEAD_UNIT = 32; - /** - * Indicates that this network has ability to support MMTEL (Multimedia Telephony service). - */ - public static final int NET_CAPABILITY_MMTEL = 33; - private static final int MIN_NET_CAPABILITY = NET_CAPABILITY_MMS; - private static final int MAX_NET_CAPABILITY = NET_CAPABILITY_MMTEL; + private static final int MAX_NET_CAPABILITY = NET_CAPABILITY_HEAD_UNIT; /** * Network capabilities that are expected to be mutable, i.e., can change while a particular @@ -2096,7 +2090,6 @@ public final class NetworkCapabilities implements Parcelable { case NET_CAPABILITY_VSIM: return "VSIM"; case NET_CAPABILITY_BIP: return "BIP"; case NET_CAPABILITY_HEAD_UNIT: return "HEAD_UNIT"; - case NET_CAPABILITY_MMTEL: return "MMTEL"; default: return Integer.toString(capability); } } diff --git a/tests/unit/java/com/android/server/ConnectivityServiceTest.java b/tests/unit/java/com/android/server/ConnectivityServiceTest.java index c47604c0eb..044ff0204b 100644 --- a/tests/unit/java/com/android/server/ConnectivityServiceTest.java +++ b/tests/unit/java/com/android/server/ConnectivityServiceTest.java @@ -81,7 +81,6 @@ import static android.net.NetworkCapabilities.NET_CAPABILITY_IA; import static android.net.NetworkCapabilities.NET_CAPABILITY_IMS; import static android.net.NetworkCapabilities.NET_CAPABILITY_INTERNET; import static android.net.NetworkCapabilities.NET_CAPABILITY_MMS; -import static android.net.NetworkCapabilities.NET_CAPABILITY_MMTEL; import static android.net.NetworkCapabilities.NET_CAPABILITY_NOT_CONGESTED; import static android.net.NetworkCapabilities.NET_CAPABILITY_NOT_METERED; import static android.net.NetworkCapabilities.NET_CAPABILITY_NOT_RESTRICTED; @@ -3587,7 +3586,7 @@ public class ConnectivityServiceTest { || capability == NET_CAPABILITY_IA || capability == NET_CAPABILITY_IMS || capability == NET_CAPABILITY_RCS || capability == NET_CAPABILITY_XCAP || capability == NET_CAPABILITY_VSIM || capability == NET_CAPABILITY_BIP - || capability == NET_CAPABILITY_ENTERPRISE || capability == NET_CAPABILITY_MMTEL) { + || capability == NET_CAPABILITY_ENTERPRISE) { assertFalse(nc.hasCapability(NET_CAPABILITY_NOT_RESTRICTED)); } else { assertTrue(nc.hasCapability(NET_CAPABILITY_NOT_RESTRICTED)); @@ -3715,7 +3714,6 @@ public class ConnectivityServiceTest { tryNetworkFactoryRequests(NET_CAPABILITY_WIFI_P2P); tryNetworkFactoryRequests(NET_CAPABILITY_IA); tryNetworkFactoryRequests(NET_CAPABILITY_RCS); - tryNetworkFactoryRequests(NET_CAPABILITY_MMTEL); tryNetworkFactoryRequests(NET_CAPABILITY_XCAP); tryNetworkFactoryRequests(NET_CAPABILITY_ENTERPRISE); tryNetworkFactoryRequests(NET_CAPABILITY_EIMS);