Merge "Have the status bar listen to all macro-users VPN changes." into pi-dev

core/java/android/net/NetworkRequest.java

@@ -24,6 +24,7 @@ import android.text.TextUtils;
 import android.util.proto.ProtoOutputStream;
 
 import java.util.Objects;
+import java.util.Set;
 
 /**
  * Defines a request for a network, made through {@link NetworkRequest.Builder} and used
@@ -204,6 +205,19 @@ public class NetworkRequest implements Parcelable {
             return this;
         }
 
+        /**
+         * Set the watched UIDs for this request. This will be reset and wiped out unless
+         * the calling app holds the CHANGE_NETWORK_STATE permission.
+         *
+         * @param uids The watched UIDs as a set of UidRanges, or null for everything.
+         * @return The builder to facilitate chaining.
+         * @hide
+         */
+        public Builder setUids(Set<UidRange> uids) {
+            mNetworkCapabilities.setUids(uids);
+            return this;
+        }
+
         /**
          * Add a capability that must not exist in the requested network.
          * <p>