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

Merge "Making NetworkCapabilities @NonNull" am: 1f21e4acf4 am: e8fb563c9a

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

Change-Id: Ifb34aa77e00c79226a73fe0121fb898c11578977
This commit is contained in:
James Mattis
2022-01-12 18:21:19 +00:00
committed by Automerger Merge Worker
parent f7648bde4c e8fb563c9a
commit ff27afbc45
1 changed files with 5 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
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,21 +36,17 @@ 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 = null;
} else {
mNetworkCapabilities = new NetworkCapabilities(networkCapabilities); mNetworkCapabilities = new NetworkCapabilities(networkCapabilities);
} }
}
private InternalNetworkUpdateRequest(@NonNull final Parcel source) { private InternalNetworkUpdateRequest(@NonNull final Parcel source) {
Objects.requireNonNull(source); Objects.requireNonNull(source);