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

Merge "Remove ArrayUtils usage in connectivity frameworks classes"

Browse Source
This commit is contained in:
Paul Hu
2021-02-02 08:47:04 +00:00
committed by Gerrit Code Review
parent d8c4953e7e 3c2297a2ab
commit 7cd199f07b
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
framework/src/android/net/NetworkCapabilities.java
View File

@@ -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.");
} }