diff options
| author | Martijn Coenen <maco@google.com> | 2021-12-21 11:24:01 +0000 |
|---|---|---|
| committer | Martijn Coenen <maco@google.com> | 2021-12-21 11:24:01 +0000 |
| commit | 6ebc8ba59511c77745adee5cbb0150f8dc63abd9 (patch) | |
| tree | 82529019a0d5bd94d4d5eb575134926184adca8e /framework/src/android/net/NetworkCapabilities.java | |
| parent | f322d4f5e03b449aba5e85b91f141c6c621cc8cc (diff) | |
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
Diffstat (limited to 'framework/src/android/net/NetworkCapabilities.java')
| -rw-r--r-- | framework/src/android/net/NetworkCapabilities.java | 9 |
1 files changed, 1 insertions, 8 deletions
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); } } |