diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2020-05-01 04:47:52 +0000 |
|---|---|---|
| committer | Lorenzo Colitti <lorenzo@google.com> | 2020-05-01 06:50:58 +0000 |
| commit | 2286603c87027195ee8efefe9ea4863b73b6ebeb (patch) | |
| tree | 5bd3cd2ffeb06808cf685b2971799ecb82fac97a /common/networkstackclient/src | |
| parent | 9d5175317630e14c2f76de6d6f273609a46a4b76 (diff) | |
Add default and nullable annotations to NetworkStack AIDLs.
All new fields should have defaults. Do that for fields added in
v6 before we freeze v6. Fields added in v5 can no longer be
changed because v5 is frozen.
Test: m
Bug: 133526962
Original-Change: https://android-review.googlesource.com/1299381
Merged-In: Ie2ecd84919a59adf89d0c56e4fdf2b2258fa1448
Change-Id: Ie2ecd84919a59adf89d0c56e4fdf2b2258fa1448
Diffstat (limited to 'common/networkstackclient/src')
3 files changed, 7 insertions, 6 deletions
diff --git a/common/networkstackclient/src/android/net/DhcpResultsParcelable.aidl b/common/networkstackclient/src/android/net/DhcpResultsParcelable.aidl index 3151565..0439d7b 100644 --- a/common/networkstackclient/src/android/net/DhcpResultsParcelable.aidl +++ b/common/networkstackclient/src/android/net/DhcpResultsParcelable.aidl @@ -24,6 +24,6 @@ parcelable DhcpResultsParcelable { int mtu; String serverAddress; String vendorInfo; - String serverHostName; - String captivePortalApiUrl; + @nullable String serverHostName; + @nullable String captivePortalApiUrl; } diff --git a/common/networkstackclient/src/android/net/ProvisioningConfigurationParcelable.aidl b/common/networkstackclient/src/android/net/ProvisioningConfigurationParcelable.aidl index 9bf4197..2d5d349 100644 --- a/common/networkstackclient/src/android/net/ProvisioningConfigurationParcelable.aidl +++ b/common/networkstackclient/src/android/net/ProvisioningConfigurationParcelable.aidl @@ -38,6 +38,6 @@ parcelable ProvisioningConfigurationParcelable { Network network; String displayName; boolean enablePreconnection; - ScanResultInfoParcelable scanResultInfo; - Layer2InformationParcelable layer2Info; + @nullable ScanResultInfoParcelable scanResultInfo; + @nullable Layer2InformationParcelable layer2Info; } diff --git a/common/networkstackclient/src/android/net/dhcp/DhcpServingParamsParcel.aidl b/common/networkstackclient/src/android/net/dhcp/DhcpServingParamsParcel.aidl index 503ccaa..3adef77 100644 --- a/common/networkstackclient/src/android/net/dhcp/DhcpServingParamsParcel.aidl +++ b/common/networkstackclient/src/android/net/dhcp/DhcpServingParamsParcel.aidl @@ -26,6 +26,7 @@ parcelable DhcpServingParamsParcel { long dhcpLeaseTimeSecs; int linkMtu; boolean metered; - int singleClientAddr; - boolean changePrefixOnDecline; + /** IP address to assign to a single client. 0.0.0.0 means support multiple clients.. */ + int singleClientAddr = 0; + boolean changePrefixOnDecline = false; } |