Merge "Add default and nullable annotations to NetworkStack AIDLs." into rvc-dev am: 023ee72619 am: 2bf64d35ac

Change-Id: I2eb6be4b5237133ffa76813bc46c01dcb32507ef

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 a74f98c..7bb5c41 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 b789e5f..b8dfb91 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 2570995..d66ca9d 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 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;
 }