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

Commit 59816ae3 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Add default and nullable annotations to NetworkStack AIDLs." am: 8e97e00a am: 71f67f0b 

Change-Id: Id00e3034ae7bc3a47c024fbe58be92efe8998864
parents 199eb8bf 71f67f0b

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;

}