Merge "Refactor UidRange by using stable aidl structure"
diff --git a/core/java/android/net/UidRange.java b/core/java/android/net/UidRange.java
index 3164929..793c82d 100644
--- a/core/java/android/net/UidRange.java
+++ b/core/java/android/net/UidRange.java
@@ -19,17 +19,14 @@
import static android.os.UserHandle.PER_USER_RANGE;
import android.os.Parcel;
-import android.os.Parcelable;
/**
* An inclusive range of UIDs.
*
* @hide
*/
-public final class UidRange implements Parcelable {
- public final int start;
- public final int stop;
-
+public final class UidRange extends UidRangeParcel {
+ private UidRange() {}
public UidRange(int startUid, int stopUid) {
if (startUid < 0) throw new IllegalArgumentException("Invalid start UID.");
if (stopUid < 0) throw new IllegalArgumentException("Invalid stop UID.");
@@ -89,26 +86,18 @@
return start + "-" + stop;
}
- // implement the Parcelable interface
- @Override
- public int describeContents() {
- return 0;
- }
-
- @Override
- public void writeToParcel(Parcel dest, int flags) {
- dest.writeInt(start);
- dest.writeInt(stop);
- }
+ /**
+ * DO NOT override "writeToParcel" and "readFromParcel" in this class.
+ * The parceling code is autogenerated by the superclass.
+ */
public static final Creator<UidRange> CREATOR =
new Creator<UidRange>() {
@Override
public UidRange createFromParcel(Parcel in) {
- int start = in.readInt();
- int stop = in.readInt();
-
- return new UidRange(start, stop);
+ UidRange obj = new UidRange();
+ obj.readFromParcel(in);
+ return obj;
}
@Override
public UidRange[] newArray(int size) {