Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c983440d authored by Remi NGUYEN VAN's avatar Remi NGUYEN VAN
Browse files

Move UidRange to connectivity 

UidRange is a data class that is an implementation detail of
Connectivity. Move it to the connectivity boundary.

Remaining usages of UidRange outside of Connectivity (in VPN) should be
migrated to other classes, like Range<Integer> or UidRangeParcel.

Bug: 181512874
Test: m
Change-Id: I6f2e3685ad1c07171dd90480d1e546329de8732d
parent 67ba0bc2

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

core/java/android/net/UidRange.java→packages/Connectivity/framework/src/android/net/UidRange.java

+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;