commit 4d2ad2a68a12a98622b0247d4153ed882f96abea
author Remi NGUYEN VAN <reminv@google.com> Fri Mar 05 10:27:57 2021 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Mar 05 10:27:57 2021 +0000
tree 9ff10c82b8faf959c1dc21c047120349155f2866
parent 74850ac20ebb71e779a99ecdc4faf5ebb66bfcde
parent 072b33fc6c4b20c117d075f6c5f2a0de89f89adf

Merge "Move NetworkState to Connectivity"

framework/src/android/net/NetworkState.java

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);