commit eb0b80c9e5e9d4a688172ca3d0393287b7310b84
author Cody Kesting <ckesting@google.com> Mon Mar 30 22:04:43 2020 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Mar 30 22:04:43 2020 +0000
tree 5b931024fc30755cffdd02e70594b8218736cefd
parent 3402ee64ed594e96378e8d8b7c4859a360970ae8
parent 7b987276db74e21cacfd2356cfc8f27e5b3aad3b

Merge "Clean up handling of NetworkCapabilities#administratorUids."

core/java/android/net/NetworkCapabilities.java

diff --git a/core/java/android/net/NetworkCapabilities.java b/core/java/android/net/NetworkCapabilities.java
index ad1e501..0ce5e34 100644
--- a/core/java/android/net/NetworkCapabilities.java
+++ b/core/java/android/net/NetworkCapabilities.java
@@ -920,7 +920,7 @@
      * 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.

services/core/java/com/android/server/ConnectivityService.java

diff --git a/services/core/java/com/android/server/ConnectivityService.java b/services/core/java/com/android/server/ConnectivityService.java
index 1484fe7..985d40d 100644
--- a/services/core/java/com/android/server/ConnectivityService.java
+++ b/services/core/java/com/android/server/ConnectivityService.java
@@ -7983,11 +7983,7 @@
 
         // 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