Clean up handling of NetworkCapabilities#administratorUids.

Update ConnectivityService's check for administrator UIDs to use
ArrayUtils to check for UID inclusion. Update the NetworkCapabilities
annotation on the administrator UIDs field to clarify that it is
NonNull.

Bug: 147903575
Test: atest FrameworksNetTests
Change-Id: Id630fe9d76aacdaf038fdaa5360f0327520ee0c3
This commit is contained in:
Cody Kesting
2020-03-18 15:22:12 -07:00
parent f06634ae70
commit 7b987276db
2 changed files with 2 additions and 6 deletions

View File

@@ -882,7 +882,7 @@ public final class NetworkCapabilities implements Parcelable {
* empty unless the destination is 1) the System Server, or 2) Telephony. In either case, the
* receiving entity must have the ACCESS_FINE_LOCATION permission and target R+.
*/
private int[] mAdministratorUids = new int[0];
@NonNull private int[] mAdministratorUids = new int[0];
/**
* Sets the int[] of UIDs that are administrators of this network.

View File

@@ -7953,11 +7953,7 @@ public class ConnectivityService extends IConnectivityManager.Stub
// Administrator UIDs also contains the Owner UID
final int[] administratorUids = nai.networkCapabilities.getAdministratorUids();
for (final int uid : administratorUids) {
if (uid == callbackUid) return true;
}
return false;
return ArrayUtils.contains(administratorUids, callbackUid);
}
@Override