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

Commit e8fb563c authored by James Mattis's avatar James Mattis Committed by Automerger Merge Worker
Browse files

Merge "Making NetworkCapabilities @NonNull" am: 1f21e4ac

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

Change-Id: I0654583490222563dac7b60aae4f4596c0e1b83f
parents 8c3fa67b 1f21e4ac
Loading
Loading
Loading
Loading
+5 −10
Original line number Diff line number Diff line
@@ -17,7 +17,6 @@
package android.net;

import android.annotation.NonNull;
import android.annotation.Nullable;
import android.os.Parcel;
import android.os.Parcelable;

@@ -27,7 +26,7 @@ import java.util.Objects;
public final class InternalNetworkUpdateRequest implements Parcelable {
    @NonNull
    private final StaticIpConfiguration mIpConfig;
    @Nullable
    @NonNull
    private final NetworkCapabilities mNetworkCapabilities;

    @NonNull
@@ -37,21 +36,17 @@ public final class InternalNetworkUpdateRequest implements Parcelable {

    @NonNull
    public NetworkCapabilities getNetworkCapabilities() {
        return mNetworkCapabilities == null
                ? null : new NetworkCapabilities(mNetworkCapabilities);
        return new NetworkCapabilities(mNetworkCapabilities);
    }

    /** @hide */
    public InternalNetworkUpdateRequest(@NonNull final StaticIpConfiguration ipConfig,
            @Nullable final NetworkCapabilities networkCapabilities) {
            @NonNull final NetworkCapabilities networkCapabilities) {
        Objects.requireNonNull(ipConfig);
        Objects.requireNonNull(networkCapabilities);
        mIpConfig = new StaticIpConfiguration(ipConfig);
        if (null == networkCapabilities) {
            mNetworkCapabilities = null;
        } else {
        mNetworkCapabilities = new NetworkCapabilities(networkCapabilities);
    }
    }

    private InternalNetworkUpdateRequest(@NonNull final Parcel source) {
        Objects.requireNonNull(source);