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

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

Change-Id: I91a09515952cf7fbbcfb4d9a824be0e4a78a7ef1
This commit is contained in:
Sarah Chin
2022-01-31 21:50:46 +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 preferred;
boolean persistent; boolean persistent;
boolean alwaysOn; boolean alwaysOn;
@nullable android.hardware.radio.data.TrafficDescriptor trafficDescriptor; android.hardware.radio.data.TrafficDescriptor trafficDescriptor;
const int ID_DEFAULT = 0; const int ID_DEFAULT = 0;
const int ID_TETHERED = 1; const int ID_TETHERED = 1;
const int ID_IMS = 2; 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 * 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. * apn; apn must be used as the end point if one is not specified through URSP rules.
*/ */
@nullable TrafficDescriptor trafficDescriptor; TrafficDescriptor trafficDescriptor;
} }