Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3e47ef8b authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

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

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

Change-Id: I0c01b0bdd4df7824284f6d7b1c6d0fa0f07901fe
parents 663e4472 6ddc0548

telephony/java/android/telephony/Annotation.java

+3 −0
Original line number Diff line number Diff line
@@ -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 { }

telephony/java/android/telephony/data/TrafficDescriptor.java

+3 −1
Original line number Diff line number Diff line
@@ -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<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. */

        private final @NonNull UUID mOsId;