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

Merge changes from topics "td_based_caps", "urllc_embb" am: 6ddc05484d

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

Change-Id: I0c01b0bdd4df7824284f6d7b1c6d0fa0f07901fe
This commit is contained in:
Treehugger Robot
2022-03-21 23:24:40 +00:00
committed by Automerger Merge Worker
parent 663e44720c 6ddc05484d
commit 3e47ef8b8b
2 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -709,6 +709,9 @@ public class Annotation {
NetworkCapabilities.NET_CAPABILITY_VSIM, NetworkCapabilities.NET_CAPABILITY_VSIM,
NetworkCapabilities.NET_CAPABILITY_BIP, NetworkCapabilities.NET_CAPABILITY_BIP,
NetworkCapabilities.NET_CAPABILITY_HEAD_UNIT, NetworkCapabilities.NET_CAPABILITY_HEAD_UNIT,
NetworkCapabilities.NET_CAPABILITY_MMTEL,
NetworkCapabilities.NET_CAPABILITY_PRIORITIZE_LATENCY,
NetworkCapabilities.NET_CAPABILITY_PRIORITIZE_BANDWIDTH
}) })
public @interface NetCapability { } public @interface NetCapability { }

4
telephony/java/android/telephony/data/TrafficDescriptor.java
View File

@@ -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 // 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 // prohibited to modify/extend the allowed list, especially passing the real package name to
// the network. // the network.
private static final Set<String> ALLOWED_APP_IDS = Set.of("ENTERPRISE"); private static final Set<String> ALLOWED_APP_IDS = Set.of(
"ENTERPRISE", "PRIORITIZE_LATENCY", "PRIORITIZE_BANDWIDTH", "CBS"
);
/** OS id in UUID format. */ /** OS id in UUID format. */
private final @NonNull UUID mOsId; private final @NonNull UUID mOsId;