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

Commit 56afc523 authored by Sarah Chin's avatar Sarah Chin Committed by Automerger Merge Worker
Browse files

Merge "Make TrafficDescriptor nonnull in DataProfileInfo" am: a2932530 am:... 

Merge "Make TrafficDescriptor nonnull in DataProfileInfo" am: a2932530 am: 5488a534 am: b0c525ca am: 893ba1f6

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1965507

Change-Id: Ibb0e6fa80eedc585fdee10a70c532175453ce3f8
parents 032c7fc7 893ba1f6

radio/aidl/aidl_api/android.hardware.radio.data/current/android/hardware/radio/data/DataProfileInfo.aidl

+1 −1
Original line number Diff line number Diff line
@@ -53,7 +53,7 @@ parcelable DataProfileInfo { 
  boolean preferred;

  boolean persistent;

  boolean alwaysOn;

  @nullable android.hardware.radio.data.TrafficDescriptor trafficDescriptor;

  android.hardware.radio.data.TrafficDescriptor trafficDescriptor;

  const int ID_DEFAULT = 0;

  const int ID_TETHERED = 1;

  const int ID_IMS = 2;

radio/aidl/android/hardware/radio/data/DataProfileInfo.aidl

+1 −1
Original line number Diff line number Diff line
@@ -128,5 +128,5 @@ parcelable DataProfileInfo { 
     * 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;

    TrafficDescriptor trafficDescriptor;

}