diff options
| author | Lorenzo Colitti <lorenzo@google.com> | 2021-02-01 11:36:03 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-02-01 11:36:03 +0000 |
| commit | 2425886baa75f8cbea237311a9037529458e4cf4 (patch) | |
| tree | 132066dec4057a3fe8b3a2eeed38f1d5418b4027 /core/java | |
| parent | b86c3a3470921ec72e2cf3644d548b202efd1b5e (diff) | |
| parent | d4caba4dafb3bccd8b26342a792ed5f4286ada7d (diff) | |
Merge changes Idcc9e32c,I58769bb7 am: d4caba4daf
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1552503
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: If12227f11585de18d92995cf603765b18f91764f
Diffstat (limited to 'core/java')
| -rw-r--r-- | core/java/android/net/NetworkState.java | 19 |
1 files changed, 15 insertions, 4 deletions
diff --git a/core/java/android/net/NetworkState.java b/core/java/android/net/NetworkState.java index 713b6888376e..e1ef8b5ea5c9 100644 --- a/core/java/android/net/NetworkState.java +++ b/core/java/android/net/NetworkState.java @@ -16,6 +16,7 @@ package android.net; +import android.annotation.NonNull; import android.compat.annotation.UnsupportedAppUsage; import android.os.Build; import android.os.Parcel; @@ -30,7 +31,8 @@ import android.util.Slog; public class NetworkState implements Parcelable { private static final boolean VALIDATE_ROAMING_STATE = false; - public static final NetworkState EMPTY = new NetworkState(null, null, null, null, null, null); + // TODO: remove and make members @NonNull. + public static final NetworkState EMPTY = new NetworkState(); public final NetworkInfo networkInfo; public final LinkProperties linkProperties; @@ -40,9 +42,18 @@ public class NetworkState implements Parcelable { public final String subscriberId; public final String networkId; - public NetworkState(NetworkInfo networkInfo, LinkProperties linkProperties, - NetworkCapabilities networkCapabilities, Network network, String subscriberId, - String networkId) { + private NetworkState() { + networkInfo = null; + linkProperties = null; + networkCapabilities = null; + network = null; + subscriberId = null; + networkId = null; + } + + public NetworkState(@NonNull NetworkInfo networkInfo, @NonNull LinkProperties linkProperties, + @NonNull NetworkCapabilities networkCapabilities, @NonNull Network network, + String subscriberId, String networkId) { this.networkInfo = networkInfo; this.linkProperties = linkProperties; this.networkCapabilities = networkCapabilities; |