| commit | 56afc523333015611999fcfb52e92049cb4cb1e7 | [log] [tgz] |
|---|---|---|
| author | Sarah Chin <sarahchin@google.com> | Mon Jan 31 22:19:47 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Jan 31 22:19:47 2022 +0000 |
| tree | 257ff1a1ed3c15bb77407786c094aa11f2a2c579 | |
| parent | 032c7fc7098d4ba54232f0cef286220727c7435d [diff] | |
| parent | 893ba1f6508d0f37b3133336fff5aebdb232930a [diff] |
Merge "Make TrafficDescriptor nonnull in DataProfileInfo" am: a2932530f3 am: 5488a5343c am: b0c525caac am: 893ba1f650 Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1965507 Change-Id: Ibb0e6fa80eedc585fdee10a70c532175453ce3f8
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 e21afc9..02bbf21 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 840f6e9..123b3ed 100644 --- a/radio/aidl/android/hardware/radio/data/DataProfileInfo.aidl +++ b/radio/aidl/android/hardware/radio/data/DataProfileInfo.aidl
@@ -128,5 +128,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; }