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