| commit | b0c525caac9ea7c452133a93907e64d8d84d605a | [log] [tgz] |
|---|---|---|
| author | Sarah Chin <sarahchin@google.com> | Mon Jan 31 21:50:46 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Jan 31 21:50:46 2022 +0000 |
| tree | 130cc0f8c72e6340fa03996e5d31923aebd72274 | |
| parent | 4212aefb5da208fb4bd5067df12499254510f54c [diff] | |
| parent | 5488a5343c716e03b82f15ed67bab66226247fb9 [diff] |
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
diff --git a/radio/aidl/aidl_api/android.hardware.radio.data/current/android/hardware/radio/data/DataProfileInfo.aidl b/radio/aidl/aidl_api/android.hardware.radio.data/current/android/hardware/radio/data/DataProfileInfo.aidl index c8efea0..94ed242 100644 --- a/radio/aidl/aidl_api/android.hardware.radio.data/current/android/hardware/radio/data/DataProfileInfo.aidl +++ b/radio/aidl/aidl_api/android.hardware.radio.data/current/android/hardware/radio/data/DataProfileInfo.aidl
@@ -53,7 +53,7 @@ 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;
diff --git a/radio/aidl/android/hardware/radio/data/DataProfileInfo.aidl b/radio/aidl/android/hardware/radio/data/DataProfileInfo.aidl index 7360202..84201d3 100644 --- a/radio/aidl/android/hardware/radio/data/DataProfileInfo.aidl +++ b/radio/aidl/android/hardware/radio/data/DataProfileInfo.aidl
@@ -130,5 +130,5 @@ * 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; }