commit f597b81b4eedaa5c2de15bd258c4922e3d791dba
author Chalard Jean <jchalard@google.com> Thu Jan 25 05:37:21 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Jan 25 05:37:21 2018 +0000
tree 66c7e5cd5f335edc110a5193f44825efebdb4fc2
parent 859629fa0bea0e5ea10ce147ab64ea8d85de336f
parent 715d0786398d8272d40f6a9b53d9242fa9993ffb

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

core/java/android/net/NetworkCapabilities.java

diff --git a/core/java/android/net/NetworkCapabilities.java b/core/java/android/net/NetworkCapabilities.java
index 31516fd..e81ed9a 100644
--- a/core/java/android/net/NetworkCapabilities.java
+++ b/core/java/android/net/NetworkCapabilities.java
@@ -892,7 +892,7 @@
      *
      * @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 @@
         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 =