LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge changes from topic "nullable-ipconfig" am: 1b13af010a

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2026565

Change-Id: I3564ece377766d0e3b2cb6f98209b00dc3a60697
This commit is contained in:
Patrick Rohr
2022-03-17 07:04:24 +00:00
committed by Automerger Merge Worker
parent eeba8050f4 1b13af010a
commit 3a74a64079
2 changed files with 18 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
framework-t/api/system-current.txt
View File

@@ -37,7 +37,7 @@ package android.net {
public final class EthernetNetworkUpdateRequest implements android.os.Parcelable { public final class EthernetNetworkUpdateRequest implements android.os.Parcelable {
method public int describeContents(); 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 @Nullable public android.net.NetworkCapabilities getNetworkCapabilities();
method public void writeToParcel(@NonNull android.os.Parcel, int); method public void writeToParcel(@NonNull android.os.Parcel, int);
field @NonNull public static final android.os.Parcelable.Creator<android.net.EthernetNetworkUpdateRequest> CREATOR; field @NonNull public static final android.os.Parcelable.Creator<android.net.EthernetNetworkUpdateRequest> CREATOR;
@@ -47,7 +47,7 @@ package android.net {
ctor public EthernetNetworkUpdateRequest.Builder(); ctor public EthernetNetworkUpdateRequest.Builder();
ctor public EthernetNetworkUpdateRequest.Builder(@NonNull android.net.EthernetNetworkUpdateRequest); ctor public EthernetNetworkUpdateRequest.Builder(@NonNull android.net.EthernetNetworkUpdateRequest);
method @NonNull public android.net.EthernetNetworkUpdateRequest build(); 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); method @NonNull public android.net.EthernetNetworkUpdateRequest.Builder setNetworkCapabilities(@Nullable android.net.NetworkCapabilities);
} }

19
tests/unit/java/android/net/EthernetNetworkUpdateRequestTest.java
View File

@@ -17,7 +17,9 @@
package android.net; package android.net;
import static com.android.testutils.DevSdkIgnoreRuleKt.SC_V2; 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.DevSdkIgnoreRule;
import com.android.testutils.DevSdkIgnoreRunner; import com.android.testutils.DevSdkIgnoreRunner;
@@ -47,8 +49,19 @@ public class EthernetNetworkUpdateRequestTest {
EthernetNetworkUpdateRequest reqWithNullCaps = EthernetNetworkUpdateRequest reqWithNullCaps =
new EthernetNetworkUpdateRequest.Builder().setIpConfiguration( new EthernetNetworkUpdateRequest.Builder().setIpConfiguration(
buildIpConfiguration()).build(); buildIpConfiguration()).build();
EthernetNetworkUpdateRequest reqWithNullConfig =
new EthernetNetworkUpdateRequest.Builder().setNetworkCapabilities(
buildNetworkCapabilities()).build();
assertParcelSane(reqWithNonNull, 2); assertParcelingIsLossless(reqWithNonNull);
assertParcelSane(reqWithNullCaps, 2); assertParcelingIsLossless(reqWithNullCaps);
assertParcelingIsLossless(reqWithNullConfig);
}
@Test
public void testEmptyUpdateRequestThrows() {
EthernetNetworkUpdateRequest.Builder emptyBuilder =
new EthernetNetworkUpdateRequest.Builder();
assertThrows(IllegalStateException.class, () -> emptyBuilder.build());
} }
} }