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

Commit 2bf64d35 authored by Lorenzo Colitti's avatar Lorenzo Colitti Committed by Automerger Merge Worker
Browse files

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

Change-Id: I6b799f85e15405c13ad59f921f89911b6e6cc790
parents 91ee1dfc 023ee726

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

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

  int mtu;

  String serverAddress;

  String serverAddress;

  String vendorInfo;

  String vendorInfo;

  String serverHostName;

  @nullable String serverHostName;

  String captivePortalApiUrl;

  @nullable String captivePortalApiUrl;

}
 
}

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

+2 −2
Original line number Original line Diff line number Diff line
@@ -30,6 +30,6 @@ parcelable ProvisioningConfigurationParcelable { 
  android.net.Network network;

  android.net.Network network;

  String displayName;

  String displayName;

  boolean enablePreconnection;

  boolean enablePreconnection;

  android.net.ScanResultInfoParcelable scanResultInfo;

  @nullable android.net.ScanResultInfoParcelable scanResultInfo;

  android.net.Layer2InformationParcelable layer2Info;

  @nullable android.net.Layer2InformationParcelable layer2Info;

}
 
}

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

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

  long dhcpLeaseTimeSecs;

  int linkMtu;

  int linkMtu;

  boolean metered;

  boolean metered;

  int singleClientAddr;

  int singleClientAddr = 0;

  boolean changePrefixOnDecline;

  boolean changePrefixOnDecline = false;

}
 
}

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

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

    int mtu;

    String serverAddress;

    String serverAddress;

    String vendorInfo;

    String vendorInfo;

    String serverHostName;

    @nullable String serverHostName;

    String captivePortalApiUrl;

    @nullable String captivePortalApiUrl;

}
 
}

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

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

    Network network;

    String displayName;

    String displayName;

    boolean enablePreconnection;

    boolean enablePreconnection;

    ScanResultInfoParcelable scanResultInfo;

    @nullable ScanResultInfoParcelable scanResultInfo;

    Layer2InformationParcelable layer2Info;

    @nullable Layer2InformationParcelable layer2Info;

}
 
}