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

Commit 16897eb4 authored by Chalard Jean's avatar Chalard Jean Committed by android-build-merger
Browse files

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

am: 806f0191

Change-Id: Ifd63fdf47348dc3a1c1871deacc61470784bdbb6
parents 2eee5f20 806f0191

core/java/android/net/NetworkCapabilities.java

+2 −2
Original line number Diff line number Diff line
@@ -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 =