Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Move NetworkState to Connectivity" am: d0355e1be2 am: e878fb157a am: 161b1278f7 am: 1623f60d39

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id14785794a721f146827ac4d5051e48c650b6bc3
This commit is contained in:
Remi NGUYEN VAN
2021-03-05 13:07:14 +00:00
committed by Automerger Merge Worker
parent dcd24cac40 1623f60d39
commit ec827d3cfd
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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