| commit | 09cf639eda6f502ca3308405e5b73c428ff186c3 | [log] [tgz] |
|---|---|---|
| author | Remi NGUYEN VAN <reminv@google.com> | Thu May 20 04:47:55 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu May 20 04:47:55 2021 +0000 |
| tree | f281c56fac0f41de360263ae90957733f1c4ac04 | |
| parent | 38c391f51b4b9a16990b594415a71500e85e46a4 [diff] | |
| parent | 7e7aa6e163869794408d25a9a7440f7a125652fe [diff] |
Merge "Remove legacy resources fallback from Connectivity" into sc-dev am: 4c0e93f15b am: 7e7aa6e163 Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14622504 Change-Id: Ifcae8b0e5ef093563e27948db6e6308a9be084a1
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()) {