diff options
| author | Lorenzo Colitti <lorenzo@google.com> | 2020-05-01 08:52:53 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2020-05-01 08:52:53 +0000 |
| commit | 023ee726195a171404e6414232a8136825902f58 (patch) | |
| tree | 1298b53bea24252c82ce80608ad23b4d60dfe181 /common | |
| parent | a51a28854f1e325fd0b9c187ab42ab05c4b4d060 (diff) | |
| parent | 2286603c87027195ee8efefe9ea4863b73b6ebeb (diff) | |
| download | platform_packages_modules_NetworkStack-023ee726195a171404e6414232a8136825902f58.tar.gz platform_packages_modules_NetworkStack-023ee726195a171404e6414232a8136825902f58.tar.bz2 platform_packages_modules_NetworkStack-023ee726195a171404e6414232a8136825902f58.zip | |
Merge "Add default and nullable annotations to NetworkStack AIDLs." into rvc-dev
Diffstat (limited to 'common')
6 files changed, 13 insertions, 12 deletions
diff --git a/common/networkstackclient/aidl_api/networkstack-aidl-interfaces/current/android/net/DhcpResultsParcelable.aidl b/common/networkstackclient/aidl_api/networkstack-aidl-interfaces/current/android/net/DhcpResultsParcelable.aidl index a74f98c8..7bb5c41c 100644 --- a/common/networkstackclient/aidl_api/networkstack-aidl-interfaces/current/android/net/DhcpResultsParcelable.aidl +++ b/common/networkstackclient/aidl_api/networkstack-aidl-interfaces/current/android/net/DhcpResultsParcelable.aidl @@ -22,6 +22,6 @@ parcelable DhcpResultsParcelable { int mtu; String serverAddress; String vendorInfo; - String serverHostName; - String captivePortalApiUrl; + @nullable String serverHostName; + @nullable String captivePortalApiUrl; } diff --git a/common/networkstackclient/aidl_api/networkstack-aidl-interfaces/current/android/net/ProvisioningConfigurationParcelable.aidl b/common/networkstackclient/aidl_api/networkstack-aidl-interfaces/current/android/net/ProvisioningConfigurationParcelable.aidl index b789e5f3..b8dfb916 100644 --- a/common/networkstackclient/aidl_api/networkstack-aidl-interfaces/current/android/net/ProvisioningConfigurationParcelable.aidl +++ b/common/networkstackclient/aidl_api/networkstack-aidl-interfaces/current/android/net/ProvisioningConfigurationParcelable.aidl @@ -30,6 +30,6 @@ parcelable ProvisioningConfigurationParcelable { android.net.Network network; String displayName; boolean enablePreconnection; - android.net.ScanResultInfoParcelable scanResultInfo; - android.net.Layer2InformationParcelable layer2Info; + @nullable android.net.ScanResultInfoParcelable scanResultInfo; + @nullable android.net.Layer2InformationParcelable layer2Info; } diff --git a/common/networkstackclient/aidl_api/networkstack-aidl-interfaces/current/android/net/dhcp/DhcpServingParamsParcel.aidl b/common/networkstackclient/aidl_api/networkstack-aidl-interfaces/current/android/net/dhcp/DhcpServingParamsParcel.aidl index 25709957..d66ca9df 100644 --- a/common/networkstackclient/aidl_api/networkstack-aidl-interfaces/current/android/net/dhcp/DhcpServingParamsParcel.aidl +++ b/common/networkstackclient/aidl_api/networkstack-aidl-interfaces/current/android/net/dhcp/DhcpServingParamsParcel.aidl @@ -25,6 +25,6 @@ parcelable DhcpServingParamsParcel { long dhcpLeaseTimeSecs; int linkMtu; boolean metered; - int singleClientAddr; - boolean changePrefixOnDecline; + int singleClientAddr = 0; + boolean changePrefixOnDecline = false; } diff --git a/common/networkstackclient/src/android/net/DhcpResultsParcelable.aidl b/common/networkstackclient/src/android/net/DhcpResultsParcelable.aidl index 31515652..0439d7b8 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 9bf4197c..2d5d3490 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 503ccaa2..3adef774 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; } |