Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge changes from topic "mmtel_capability" am: 4b07c1b401 am: 6ab83e6216

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

Change-Id: I6dda7fbe2b65fb468cc90aceafc71a0d766c25b3
This commit is contained in:
Treehugger Robot
2021-12-21 11:41:07 +00:00
committed by Automerger Merge Worker
parent ec849ed683 6ab83e6216
commit 764e5d7fae
2 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/java/android/net/vcn/VcnGatewayConnectionConfig.java
View File

@@ -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);

1
telephony/java/android/telephony/Annotation.java
View File

@@ -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 { }