LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Refactor UidRange by using stable aidl structure

Browse Source 
Use stable aidl generated structure instead of UidRange

Test: runtest frameworks-net passes
Test: manual testing of UidRange related function works
Change-Id: Iaf1c10777dc1e71df2be2a57533a10257b12626b
This commit is contained in:
Luke Huang
2018-10-19 15:57:05 +09:00
parent 698b80818c
commit 477db5fe1a
1 changed files with 9 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
core/java/android/net/UidRange.java
View File

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