From 2c44ed9350f8afa6999735a5ae802144c54787bd Mon Sep 17 00:00:00 2001 From: Jack Yu Date: Sat, 29 Jan 2022 15:28:21 -0800 Subject: [PATCH] Supported URLLC, EMBB, and CBS slicing Supported URLLC (Ultra Reliable Low Latency Communications), eMBB (enhanced Mobile Broadband), and carrier specific service for 5G slicing. Test: atest DataNetworkTest DataProfileManagerTest TelephonyNetworkRequestTest TrafficDescriptorTest & CTS Fix: 215232817 Change-Id: Ia6d79d10f39f998cfc35ab56ec625c6ec7e4b990 Merged-In: Ia6d79d10f39f998cfc35ab56ec625c6ec7e4b990 --- telephony/java/android/telephony/Annotation.java | 3 +++ telephony/java/android/telephony/data/TrafficDescriptor.java | 4 +++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/telephony/java/android/telephony/Annotation.java b/telephony/java/android/telephony/Annotation.java index a630d3b56798a..86b98f1cbe79a 100644 --- a/telephony/java/android/telephony/Annotation.java +++ b/telephony/java/android/telephony/Annotation.java @@ -709,6 +709,9 @@ public class Annotation { NetworkCapabilities.NET_CAPABILITY_VSIM, NetworkCapabilities.NET_CAPABILITY_BIP, NetworkCapabilities.NET_CAPABILITY_HEAD_UNIT, + NetworkCapabilities.NET_CAPABILITY_MMTEL, + NetworkCapabilities.NET_CAPABILITY_PRIORITIZE_LATENCY, + NetworkCapabilities.NET_CAPABILITY_PRIORITIZE_BANDWIDTH }) public @interface NetCapability { } diff --git a/telephony/java/android/telephony/data/TrafficDescriptor.java b/telephony/java/android/telephony/data/TrafficDescriptor.java index 1086eb78e49d2..66dcf8f49e9c6 100644 --- a/telephony/java/android/telephony/data/TrafficDescriptor.java +++ b/telephony/java/android/telephony/data/TrafficDescriptor.java @@ -55,7 +55,9 @@ public final class TrafficDescriptor implements Parcelable { // The following app ids are the only apps id Android supports. OEMs or vendors are // prohibited to modify/extend the allowed list, especially passing the real package name to // the network. - private static final Set ALLOWED_APP_IDS = Set.of("ENTERPRISE"); + private static final Set ALLOWED_APP_IDS = Set.of( + "ENTERPRISE", "PRIORITIZE_LATENCY", "PRIORITIZE_BANDWIDTH", "CBS" + ); /** OS id in UUID format. */ private final @NonNull UUID mOsId;