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

Commit 25369d3c authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Check NETWORK_SETTINGS permission for getAllNetworkStateSnapshots" into... 

Merge "Check NETWORK_SETTINGS permission for getAllNetworkStateSnapshots" into sc-dev am: 95188f37

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

Change-Id: Ib259c6351471aca6656dc4d46bb7242228a226c2
parents c510cc24 95188f37

packages/Connectivity/service/src/com/android/server/ConnectivityService.java

+1 −1
Original line number Diff line number Diff line
@@ -2213,7 +2213,7 @@ public class ConnectivityService extends IConnectivityManager.Stub 
    @NonNull

    public List<NetworkStateSnapshot> getAllNetworkStateSnapshots() {

        // This contains IMSI details, so make sure the caller is privileged.

        PermissionUtils.enforceNetworkStackPermission(mContext);

        enforceNetworkStackOrSettingsPermission();



        final ArrayList<NetworkStateSnapshot> result = new ArrayList<>();

        for (Network network : getAllNetworks()) {