Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 48b19cb2 authored by Lorenzo Colitti's avatar Lorenzo Colitti
Browse files

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
Change-Id: Ie2ecd84919a59adf89d0c56e4fdf2b2258fa1448
parent 79eee71f

common/networkstackclient/aidl_api/networkstack-aidl-interfaces/current/android/net/DhcpResultsParcelable.aidl

+2 −2
Original line number Diff line number Diff line
@@ -22,6 +22,6 @@ parcelable DhcpResultsParcelable { 
  int mtu;

  String serverAddress;

  String vendorInfo;

  String serverHostName;

  String captivePortalApiUrl;

  @nullable String serverHostName;

  @nullable String captivePortalApiUrl;

}

common/networkstackclient/aidl_api/networkstack-aidl-interfaces/current/android/net/ProvisioningConfigurationParcelable.aidl

+2 −2
Original line number Diff line number Diff line
@@ -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;

}

common/networkstackclient/aidl_api/networkstack-aidl-interfaces/current/android/net/dhcp/DhcpServingParamsParcel.aidl

+2 −2
Original line number Diff line number Diff line
@@ -25,6 +25,6 @@ parcelable DhcpServingParamsParcel { 
  long dhcpLeaseTimeSecs;

  int linkMtu;

  boolean metered;

  int singleClientAddr;

  boolean changePrefixOnDecline;

  int singleClientAddr = 0;

  boolean changePrefixOnDecline = false;

}

common/networkstackclient/src/android/net/DhcpResultsParcelable.aidl

+2 −2
Original line number Diff line number Diff line
@@ -24,6 +24,6 @@ parcelable DhcpResultsParcelable { 
    int mtu;

    String serverAddress;

    String vendorInfo;

    String serverHostName;

    String captivePortalApiUrl;

    @nullable String serverHostName;

    @nullable String captivePortalApiUrl;

}

common/networkstackclient/src/android/net/ProvisioningConfigurationParcelable.aidl

+2 −2
Original line number Diff line number Diff line
@@ -38,6 +38,6 @@ parcelable ProvisioningConfigurationParcelable { 
    Network network;

    String displayName;

    boolean enablePreconnection;

    ScanResultInfoParcelable scanResultInfo;

    Layer2InformationParcelable layer2Info;

    @nullable ScanResultInfoParcelable scanResultInfo;

    @nullable Layer2InformationParcelable layer2Info;

}