LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "Fix a bug where a NetworkAgent gets repeatedly torn down" am: f597b81b4e

Browse Source 
am: ca1ca2c465

Change-Id: Ifd63fdf47348dc3a1c1871deacc61470784bdbb6
This commit is contained in:
Chalard Jean
2018-01-25 07:41:44 +00:00
committed by android-build-merger
parent 0502191af2 ca1ca2c465
commit bc60d7b06e
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/java/android/net/NetworkCapabilities.java
View File

@@ -892,7 +892,7 @@ public final class NetworkCapabilities implements Parcelable {
* *
* @hide * @hide
*/ */
private Set<UidRange> mUids = null; private ArraySet<UidRange> mUids = null;
/** /**
* Convenience method to set the UIDs this network applies to to a single UID. * Convenience method to set the UIDs this network applies to to a single UID.
@@ -1180,7 +1180,7 @@ public final class NetworkCapabilities implements Parcelable {
dest.writeInt(mLinkDownBandwidthKbps); dest.writeInt(mLinkDownBandwidthKbps);
dest.writeParcelable((Parcelable) mNetworkSpecifier, flags); dest.writeParcelable((Parcelable) mNetworkSpecifier, flags);
dest.writeInt(mSignalStrength); dest.writeInt(mSignalStrength);
dest.writeArraySet(new ArraySet<>(mUids)); dest.writeArraySet(mUids);
} }
public static final Creator<NetworkCapabilities> CREATOR = public static final Creator<NetworkCapabilities> CREATOR =