diff --git a/framework-t/api/system-current.txt b/framework-t/api/system-current.txt index c502f72ccb..0149115e16 100644 --- a/framework-t/api/system-current.txt +++ b/framework-t/api/system-current.txt @@ -37,7 +37,7 @@ package android.net { public final class EthernetNetworkUpdateRequest implements android.os.Parcelable { method public int describeContents(); - method @NonNull public android.net.IpConfiguration getIpConfiguration(); + method @Nullable public android.net.IpConfiguration getIpConfiguration(); method @Nullable public android.net.NetworkCapabilities getNetworkCapabilities(); method public void writeToParcel(@NonNull android.os.Parcel, int); field @NonNull public static final android.os.Parcelable.Creator CREATOR; @@ -47,7 +47,7 @@ package android.net { ctor public EthernetNetworkUpdateRequest.Builder(); ctor public EthernetNetworkUpdateRequest.Builder(@NonNull android.net.EthernetNetworkUpdateRequest); method @NonNull public android.net.EthernetNetworkUpdateRequest build(); - method @NonNull public android.net.EthernetNetworkUpdateRequest.Builder setIpConfiguration(@NonNull android.net.IpConfiguration); + method @NonNull public android.net.EthernetNetworkUpdateRequest.Builder setIpConfiguration(@Nullable android.net.IpConfiguration); method @NonNull public android.net.EthernetNetworkUpdateRequest.Builder setNetworkCapabilities(@Nullable android.net.NetworkCapabilities); } diff --git a/tests/unit/java/android/net/EthernetNetworkUpdateRequestTest.java b/tests/unit/java/android/net/EthernetNetworkUpdateRequestTest.java index 314fbcfca7..ca9558b7f7 100644 --- a/tests/unit/java/android/net/EthernetNetworkUpdateRequestTest.java +++ b/tests/unit/java/android/net/EthernetNetworkUpdateRequestTest.java @@ -17,7 +17,9 @@ package android.net; import static com.android.testutils.DevSdkIgnoreRuleKt.SC_V2; -import static com.android.testutils.ParcelUtils.assertParcelSane; +import static com.android.testutils.ParcelUtils.assertParcelingIsLossless; + +import static org.junit.Assert.assertThrows; import com.android.testutils.DevSdkIgnoreRule; import com.android.testutils.DevSdkIgnoreRunner; @@ -47,8 +49,19 @@ public class EthernetNetworkUpdateRequestTest { EthernetNetworkUpdateRequest reqWithNullCaps = new EthernetNetworkUpdateRequest.Builder().setIpConfiguration( buildIpConfiguration()).build(); + EthernetNetworkUpdateRequest reqWithNullConfig = + new EthernetNetworkUpdateRequest.Builder().setNetworkCapabilities( + buildNetworkCapabilities()).build(); - assertParcelSane(reqWithNonNull, 2); - assertParcelSane(reqWithNullCaps, 2); + assertParcelingIsLossless(reqWithNonNull); + assertParcelingIsLossless(reqWithNullCaps); + assertParcelingIsLossless(reqWithNullConfig); + } + + @Test + public void testEmptyUpdateRequestThrows() { + EthernetNetworkUpdateRequest.Builder emptyBuilder = + new EthernetNetworkUpdateRequest.Builder(); + assertThrows(IllegalStateException.class, () -> emptyBuilder.build()); } }