| commit | 1285b9ca409453f8f3d9a766c5a9c1c24b3b94c8 | [log] [tgz] |
|---|---|---|
| author | Remi NGUYEN VAN <reminv@google.com> | Fri Mar 05 12:32:57 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Mar 05 12:32:57 2021 +0000 |
| tree | e7e4a71fce3ef99cced61976a79efa42e9193084 | |
| parent | b78e65506f32a4897a815e5bfebce0a8d48b02c7 [diff] | |
| parent | d7e667b28f0153af05e71758403ded666886c2c2 [diff] |
Merge "Move NetworkState to Connectivity" am: 4d2ad2a68a am: 65982d493b am: d7e667b28f Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1620379 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Icea1247fd498e8661cb8cba68d34a443004a246d
diff --git a/core/java/android/net/NetworkState.java b/framework/src/android/net/NetworkState.java similarity index 97% rename from core/java/android/net/NetworkState.java rename to framework/src/android/net/NetworkState.java index 813fde1..d010265 100644 --- a/core/java/android/net/NetworkState.java +++ b/framework/src/android/net/NetworkState.java
@@ -115,7 +115,8 @@ } @UnsupportedAppUsage - public static final @android.annotation.NonNull Creator<NetworkState> CREATOR = new Creator<NetworkState>() { + @NonNull + public static final Creator<NetworkState> CREATOR = new Creator<NetworkState>() { @Override public NetworkState createFromParcel(Parcel in) { return new NetworkState(in);