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

Commit 085d59ba authored by James Mattis's avatar James Mattis
Browse files

Making NetworkCapabilities @NonNull 

Updating InternalNetworkUpdateRequest to require non-null network
capabilities.

Bug: 210485380
Test: atest EthernetServiceTests
Change-Id: I660d039166451c22ffe5b5e603c649a43b71ebf1
parent 076fb5e9

core/java/android/net/InternalNetworkUpdateRequest.java

+5 −10
Original line number Original line Diff line number Diff line
@@ -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);