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

Commit 3d7d0d29 authored by Sarah Chin's avatar Sarah Chin Committed by Gerrit Code Review
Browse files

Merge "Add TrafficDescriptor to DataProfileInfo"

parents 02d2df71 e98dd0e9
Loading
Loading
Loading
Loading
+1 −0
Original line number Diff line number Diff line
@@ -53,6 +53,7 @@ parcelable DataProfileInfo {
  boolean preferred;
  boolean persistent;
  boolean alwaysOn;
  @nullable android.hardware.radio.data.TrafficDescriptor trafficDescriptor;
  const int ID_DEFAULT = 0;
  const int ID_TETHERED = 1;
  const int ID_IMS = 2;
+1 −1
Original line number Diff line number Diff line
@@ -46,7 +46,7 @@ interface IRadioData {
  oneway void setDataThrottling(in int serial, in android.hardware.radio.data.DataThrottlingAction dataThrottlingAction, in long completionDurationMillis);
  oneway void setInitialAttachApn(in int serial, in android.hardware.radio.data.DataProfileInfo dataProfileInfo);
  oneway void setResponseFunctions(in android.hardware.radio.data.IRadioDataResponse radioDataResponse, in android.hardware.radio.data.IRadioDataIndication radioDataIndication);
  oneway void setupDataCall(in int serial, in android.hardware.radio.AccessNetwork accessNetwork, in android.hardware.radio.data.DataProfileInfo dataProfileInfo, in boolean roamingAllowed, in android.hardware.radio.data.DataRequestReason reason, in android.hardware.radio.data.LinkAddress[] addresses, in String[] dnses, in int pduSessionId, in @nullable android.hardware.radio.data.SliceInfo sliceInfo, in @nullable android.hardware.radio.data.TrafficDescriptor trafficDescriptor, in boolean matchAllRuleAllowed);
  oneway void setupDataCall(in int serial, in android.hardware.radio.AccessNetwork accessNetwork, in android.hardware.radio.data.DataProfileInfo dataProfileInfo, in boolean roamingAllowed, in android.hardware.radio.data.DataRequestReason reason, in android.hardware.radio.data.LinkAddress[] addresses, in String[] dnses, in int pduSessionId, in @nullable android.hardware.radio.data.SliceInfo sliceInfo, in boolean matchAllRuleAllowed);
  oneway void startHandover(in int serial, in int callId);
  oneway void startKeepalive(in int serial, in android.hardware.radio.data.KeepaliveRequest keepalive);
  oneway void stopKeepalive(in int serial, in int sessionHandle);
+1 −1
Original line number Diff line number Diff line
@@ -37,5 +37,5 @@ interface IRadioDataIndication {
  oneway void dataCallListChanged(in android.hardware.radio.RadioIndicationType type, in android.hardware.radio.data.SetupDataCallResult[] dcList);
  oneway void keepaliveStatus(in android.hardware.radio.RadioIndicationType type, in android.hardware.radio.data.KeepaliveStatus status);
  oneway void pcoData(in android.hardware.radio.RadioIndicationType type, in android.hardware.radio.data.PcoDataInfo pco);
  oneway void unthrottleApn(in android.hardware.radio.RadioIndicationType type, in String apn);
  oneway void unthrottleApn(in android.hardware.radio.RadioIndicationType type, in android.hardware.radio.data.DataProfileInfo dataProfileInfo);
}
+9 −0
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ import android.hardware.radio.RadioAccessFamily;
import android.hardware.radio.data.ApnAuthType;
import android.hardware.radio.data.ApnTypes;
import android.hardware.radio.data.PdpProtocolType;
import android.hardware.radio.data.TrafficDescriptor;

@VintfStability
parcelable DataProfileInfo {
@@ -122,4 +123,12 @@ parcelable DataProfileInfo {
     * See 3GPP TS 23.501 section 5.6.13 for the details.
     */
    boolean alwaysOn;
    /**
     * TrafficDescriptor for which data connection needs to be established.
     * It is used for URSP traffic matching as described in TS 24.526 Section 4.2.2.
     * It includes an optional DNN which, if present, must be used for traffic matching --
     * it does not specify the end point to be used for the data call. The end point is specified by
     * apn; apn must be used as the end point if one is not specified through URSP rules.
     */
    @nullable TrafficDescriptor trafficDescriptor;
}
+0 −7
Original line number Diff line number Diff line
@@ -219,12 +219,6 @@ oneway interface IRadioData {
     *        EPDG to 5G. It is valid only when accessNetwork is AccessNetwork:NGRAN. If the slice
     *        passed from EPDG is rejected, then the data failure cause must be
     *        DataCallFailCause:SLICE_REJECTED.
     * @param trafficDescriptor TrafficDescriptor for which data connection needs to be established.
     *        It is used for URSP traffic matching as described in TS 24.526 Section 4.2.2.
     *        It includes an optional DNN which, if present, must be used for traffic matching --
     *        it does not specify the end point to be used for the data call. The end point is
     *        specified by DataProfileInfo.apn; DataProfileInfo.apn must be used as the end point if
     *        one is not specified through URSP rules.
     * @param matchAllRuleAllowed bool to indicate if using default match-all URSP rule for this
     *        request is allowed. If false, this request must not use the match-all URSP rule and if
     *        a non-match-all rule is not found (or if URSP rules are not available) it should
@@ -238,7 +232,6 @@ oneway interface IRadioData {
            in DataProfileInfo dataProfileInfo, in boolean roamingAllowed,
            in DataRequestReason reason, in LinkAddress[] addresses, in String[] dnses,
            in int pduSessionId, in @nullable SliceInfo sliceInfo,
            in @nullable TrafficDescriptor trafficDescriptor,
            in boolean matchAllRuleAllowed);

    /**
Loading