| commit | 38c391f51b4b9a16990b594415a71500e85e46a4 | [log] [tgz] |
|---|---|---|
| author | TreeHugger Robot <treehugger-gerrit@google.com> | Thu May 20 04:31:14 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu May 20 04:31:14 2021 +0000 |
| tree | f281c56fac0f41de360263ae90957733f1c4ac04 | |
| parent | 28005c0ba9488840642ad3ed7f1227a2493c5c54 [diff] | |
| parent | 7c62e96e041c2565b42406519714806bb1fdf7db [diff] |
Merge "Check NETWORK_SETTINGS permission for getAllNetworkStateSnapshots" into sc-dev am: 6f0f141cd5 am: 7c62e96e04 Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14601670 Change-Id: Ib3d94471163139f281eaeff5cc67716eaffea593
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()) {