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

Commit 3f5702c5 authored by Remi NGUYEN VAN's avatar Remi NGUYEN VAN Committed by Automerger Merge Worker
Browse files

Merge "Move UidRange to connectivity" am: 5a810375 am: 4f6f1723 am: 6dd910c7 

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1612295

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie9d41595a21c494931e9bf45bfc4e8b2aa9803f3
parents 863f6048 6dd910c7

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;