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

Commit ace78186 authored by Paul Hu's avatar Paul Hu Committed by Automerger Merge Worker
Browse files

Merge "Remove ArrayUtils usage in connectivity frameworks classes" am: c4cf8d3d 

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia8063e83503dce99985e999235ab7eb75f7cd747
parents 2a0adcf0 c4cf8d3d

packages/Connectivity/framework/src/android/net/NetworkCapabilities.java

+4 −4
Original line number Original line Diff line number Diff line
@@ -34,9 +34,9 @@ import android.util.ArraySet; 
import android.util.proto.ProtoOutputStream;

import android.util.proto.ProtoOutputStream;





import com.android.internal.annotations.VisibleForTesting;

import com.android.internal.annotations.VisibleForTesting;

import com.android.internal.util.ArrayUtils;

import com.android.internal.util.BitUtils;

import com.android.internal.util.BitUtils;

import com.android.internal.util.Preconditions;

import com.android.internal.util.Preconditions;

import com.android.net.module.util.CollectionUtils;





import java.lang.annotation.Retention;

import java.lang.annotation.Retention;

import java.lang.annotation.RetentionPolicy;

import java.lang.annotation.RetentionPolicy;
@@ -767,7 +767,7 @@ public final class NetworkCapabilities implements Parcelable { 
        if (originalOwnerUid == creatorUid) {

        if (originalOwnerUid == creatorUid) {

            setOwnerUid(creatorUid);

            setOwnerUid(creatorUid);

        }

        }

        if (ArrayUtils.contains(originalAdministratorUids, creatorUid)) {

        if (CollectionUtils.contains(originalAdministratorUids, creatorUid)) {

            setAdministratorUids(new int[] {creatorUid});

            setAdministratorUids(new int[] {creatorUid});

        }

        }

        // There is no need to clear the UIDs, they have already been cleared by clearAll() above.

        // There is no need to clear the UIDs, they have already been cleared by clearAll() above.
@@ -1873,7 +1873,7 @@ public final class NetworkCapabilities implements Parcelable { 
            sb.append(" OwnerUid: ").append(mOwnerUid);

            sb.append(" OwnerUid: ").append(mOwnerUid);

        }

        }





        if (!ArrayUtils.isEmpty(mAdministratorUids)) {

        if (mAdministratorUids != null && mAdministratorUids.length != 0) {

            sb.append(" AdminUids: ").append(Arrays.toString(mAdministratorUids));

            sb.append(" AdminUids: ").append(Arrays.toString(mAdministratorUids));

        }

        }
@@ -2506,7 +2506,7 @@ public final class NetworkCapabilities implements Parcelable { 
        @NonNull

        @NonNull

        public NetworkCapabilities build() {

        public NetworkCapabilities build() {

            if (mCaps.getOwnerUid() != Process.INVALID_UID) {

            if (mCaps.getOwnerUid() != Process.INVALID_UID) {

                if (!ArrayUtils.contains(mCaps.getAdministratorUids(), mCaps.getOwnerUid())) {

                if (!CollectionUtils.contains(mCaps.getAdministratorUids(), mCaps.getOwnerUid())) {

                    throw new IllegalStateException("The owner UID must be included in "

                    throw new IllegalStateException("The owner UID must be included in "

                            + " administrator UIDs.");

                            + " administrator UIDs.");

                }

                }