Merge "Fix a bug where a NetworkAgent gets repeatedly torn down"

am: f597b81b4e

Change-Id: Ic37c9f60448b10c861a78848bed18ebd4e0ad910
This commit is contained in:
Chalard Jean
2018-01-25 07:33:35 +00:00
committed by android-build-merger

View File

@@ -892,7 +892,7 @@ public final class NetworkCapabilities implements Parcelable {
*
* @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.
@@ -1180,7 +1180,7 @@ public final class NetworkCapabilities implements Parcelable {
dest.writeInt(mLinkDownBandwidthKbps);
dest.writeParcelable((Parcelable) mNetworkSpecifier, flags);
dest.writeInt(mSignalStrength);
dest.writeArraySet(new ArraySet<>(mUids));
dest.writeArraySet(mUids);
}
public static final Creator<NetworkCapabilities> CREATOR =