Merge "Add default and nullable annotations to NetworkStack AIDLs." into rvc-dev

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;
 }