Merge "Move UidRange to connectivity" (5a810375) · Commits · e / os / android_frameworks_base

core/java/android/os/INetworkManagementService.aidl

+0 −1

Original line number	Diff line number	Diff line
		@@ -23,7 +23,6 @@ import android.net.ITetheringStatsProvider;
		import android.net.Network;
		import android.net.NetworkStats;
		import android.net.RouteInfo;
		import android.net.UidRange;

		/**
		* @hide

+0 −0

File moved.

+13 −14

Original line number	Diff line number	Diff line
		@@ -16,8 +16,6 @@

		package android.net;

		import static android.os.UserHandle.PER_USER_RANGE;

		import android.annotation.Nullable;
		import android.os.Parcel;
		import android.os.Parcelable;
		@@ -60,6 +58,7 @@ public final class UidRange implements Parcelable {
		return UserHandle.getUserHandleForUid(stop).getIdentifier();
		}

		/** Returns whether the UidRange contains the specified UID. */
		public boolean contains(int uid) {
		return start <= uid && uid <= stop;
		}
		@@ -72,7 +71,7 @@ public final class UidRange implements Parcelable {
		}

		/**
		* @return {@code true} if this range contains every UID contained by the {@param other} range.
		* @return {@code true} if this range contains every UID contained by the {@code other} range.
		*/
		public boolean containsRange(UidRange other) {
		return start <= other.start && other.stop <= stop;