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

Commit 1623f60d authored by Remi NGUYEN VAN's avatar Remi NGUYEN VAN Committed by Automerger Merge Worker
Browse files

Merge "Move NetworkState to Connectivity" am: d0355e1b am: e878fb15 am: 161b1278 

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1620379

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Icea1247fd498e8661cb8cba68d34a443004a246d
parents ec83e704 161b1278

core/java/android/net/NetworkState.java→packages/Connectivity/framework/src/android/net/NetworkState.java

+2 −1
Original line number Diff line number Diff line
@@ -115,7 +115,8 @@ public class NetworkState implements Parcelable { 
    }



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