commit 6f0f141cd5ef867f272d12a92c1986c94e2d7ebc
author TreeHugger Robot <treehugger-gerrit@google.com> Thu May 20 03:59:55 2021 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu May 20 03:59:55 2021 +0000
tree 05c99a7b2ff35ed33c4bf7406e23c0331549d9e9
parent 4c0e93f15b8f5a78843dd4e73f50981a8ca673b4
parent 7968fba7ad642821495945ab7306195e6091ec73

Merge "Check NETWORK_SETTINGS permission for getAllNetworkStateSnapshots" into sc-dev

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

diff --git a/service/src/com/android/server/ConnectivityService.java b/service/src/com/android/server/ConnectivityService.java
index d42b264..6027a99 100644
--- a/service/src/com/android/server/ConnectivityService.java
+++ b/service/src/com/android/server/ConnectivityService.java
@@ -2213,7 +2213,7 @@
     @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()) {