| commit | d7e667b28f0153af05e71758403ded666886c2c2 | [log] [tgz] |
|---|---|---|
| author | Remi NGUYEN VAN <reminv@google.com> | Fri Mar 05 11:56:39 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Mar 05 11:56:39 2021 +0000 |
| tree | 9ff10c82b8faf959c1dc21c047120349155f2866 | |
| parent | a095858f1fe1ad7e44e16242423096bbb8f5dd43 [diff] | |
| parent | 65982d493b35b23cd715d0dce1aa424914a83231 [diff] |
Merge "Move NetworkState to Connectivity" am: 4d2ad2a68a am: 65982d493b Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1620379 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I3f87db84ac7d49c7f781ff9bd188f90dac54db8e
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);