Merge "Make some of the UID-based VPN code reusable" into nyc-dev

am: 4920698e17

* commit '4920698e17dc8aacd1b0743d313383a8ee1a3400':
  Make some of the UID-based VPN code reusable

Change-Id: I3f1b1a08059aa58cb76db6cdd070b103024b9bf3

core/java/android/net/UidRange.java

@@ -48,6 +48,17 @@ public final class UidRange implements Parcelable {
         return start / PER_USER_RANGE;
     }
 
+    public boolean contains(int uid) {
+        return start <= uid && uid <= stop;
+    }
+
+    /**
+     * @return {@code true} if this range contains every UID contained by the {@param other} range.
+     */
+    public boolean containsRange(UidRange other) {
+        return start <= other.start && other.stop <= stop;
+    }
+
     @Override
     public int hashCode() {
         int result = 17;