Merge "Make TrafficDescriptor nonnull in DataProfileInfo" am: a2932530f3 am: 5488a5343c am: b0c525caac

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

Change-Id: I7e42f6587960ff727d9d34f0fbf90c4526a5114a
This commit is contained in:
Sarah Chin
2022-01-31 22:06:37 +00:00
committed by Automerger Merge Worker
2 changed files with 2 additions and 2 deletions

View File

@@ -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;

View File

@@ -130,5 +130,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;
}