| commit | 5488a5343c716e03b82f15ed67bab66226247fb9 | [log] [tgz] |
|---|---|---|
| author | Sarah Chin <sarahchin@google.com> | Mon Jan 31 21:35:35 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Jan 31 21:35:35 2022 +0000 |
| tree | de3fc66185b42b223e6299cd85cc13267e4a0d12 | |
| parent | 9efd7960450afe91928d706a8d63992a3d683270 [diff] | |
| parent | a2932530f36825f2e53a268119ffdac07aa1df4b [diff] |
Merge "Make TrafficDescriptor nonnull in DataProfileInfo" am: a2932530f3 Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1965507 Change-Id: I00e7a7902ec7b68d48e86fd91b871875dbea0561
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; }