Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Making NetworkCapabilities @NonNull" am: 1f21e4acf4

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1941593

Change-Id: I0654583490222563dac7b60aae4f4596c0e1b83f
This commit is contained in:
James Mattis
2022-01-12 18:03:53 +00:00
committed by Automerger Merge Worker
parent 8c3fa67bbd 1f21e4acf4
commit e8fb563c9a
1 changed files with 5 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
core/java/android/net/InternalNetworkUpdateRequest.java
View File

@@ -17,7 +17,6 @@
package android.net; package android.net;
import android.annotation.NonNull; import android.annotation.NonNull;
import android.annotation.Nullable;
import android.os.Parcel; import android.os.Parcel;
import android.os.Parcelable; import android.os.Parcelable;
@@ -27,7 +26,7 @@ import java.util.Objects;
public final class InternalNetworkUpdateRequest implements Parcelable { public final class InternalNetworkUpdateRequest implements Parcelable {
@NonNull @NonNull
private final StaticIpConfiguration mIpConfig; private final StaticIpConfiguration mIpConfig;
@Nullable @NonNull
private final NetworkCapabilities mNetworkCapabilities; private final NetworkCapabilities mNetworkCapabilities;
@NonNull @NonNull
@@ -37,20 +36,16 @@ public final class InternalNetworkUpdateRequest implements Parcelable {
@NonNull @NonNull
public NetworkCapabilities getNetworkCapabilities() { public NetworkCapabilities getNetworkCapabilities() {
return mNetworkCapabilities == null return new NetworkCapabilities(mNetworkCapabilities);
? null : new NetworkCapabilities(mNetworkCapabilities);
} }
/** @hide */ /** @hide */
public InternalNetworkUpdateRequest(@NonNull final StaticIpConfiguration ipConfig, public InternalNetworkUpdateRequest(@NonNull final StaticIpConfiguration ipConfig,
@Nullable final NetworkCapabilities networkCapabilities) { @NonNull final NetworkCapabilities networkCapabilities) {
Objects.requireNonNull(ipConfig); Objects.requireNonNull(ipConfig);
Objects.requireNonNull(networkCapabilities);
mIpConfig = new StaticIpConfiguration(ipConfig); mIpConfig = new StaticIpConfiguration(ipConfig);
if (null == networkCapabilities) { mNetworkCapabilities = new NetworkCapabilities(networkCapabilities);
mNetworkCapabilities = null;
} else {
mNetworkCapabilities = new NetworkCapabilities(networkCapabilities);
}
} }
private InternalNetworkUpdateRequest(@NonNull final Parcel source) { private InternalNetworkUpdateRequest(@NonNull final Parcel source) {