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

Commit 2b252e9f authored by Cody Kesting's avatar Cody Kesting Committed by Automerger Merge Worker
Browse files

Merge "Clean up handling of NetworkCapabilities#administratorUids." into... 

Merge "Clean up handling of NetworkCapabilities#administratorUids." into rvc-dev am: 221d383f am: 87d73dd7

Change-Id: Ibb091745375c0335f3ad1a23b26ce673248eb9b7
parents ef29addd 87d73dd7

core/java/android/net/NetworkCapabilities.java

+1 −1
Original line number Original line Diff line number Diff line
@@ -920,7 +920,7 @@ public final class NetworkCapabilities implements Parcelable { 
     * empty unless the destination is 1) the System Server, or 2) Telephony. In either case, the

     * 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+.

     * 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.

     * Sets the int[] of UIDs that are administrators of this network.

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

+1 −5
Original line number Original line Diff line number Diff line
@@ -7992,11 +7992,7 @@ public class ConnectivityService extends IConnectivityManager.Stub 




        // Administrator UIDs also contains the Owner UID

        // Administrator UIDs also contains the Owner UID

        final int[] administratorUids = nai.networkCapabilities.getAdministratorUids();

        final int[] administratorUids = nai.networkCapabilities.getAdministratorUids();

        for (final int uid : administratorUids) {

        return ArrayUtils.contains(administratorUids, callbackUid);

            if (uid == callbackUid) return true;

        }



        return false;

    }

    }





    @Override

    @Override