| commit | eaaacb0d47516434668fa23da927bb914f208947 | [log] [tgz] |
|---|---|---|
| author | junyulai <junyulai@google.com> | Fri May 14 18:04:29 2021 +0800 |
| committer | Junyu Lai <junyulai@google.com> | Wed Jun 09 01:34:14 2021 +0000 |
| tree | 72eded25b7b5305b0656447adbad04be91199e6a | |
| parent | de3c20ecb5ffc927286a0a5a7720a65bc323bca5 [diff] |
Check NETWORK_SETTINGS permission for getAllNetworkStateSnapshots This is declared in the API surface, but the implementation does not match. Test: atest CtsNetTestCases:android.net.cts.ConnectivityManagerTest#testGetAllNetworkStateSnapshots Bug: 188140631 Merged-In: I3c2563d4ae4e3715d0c6270344ba8f7ef067872f Merged-In: I97aa69651461ebe5c323ec669372f9a61b84e6a6 Change-Id: I97aa69651461ebe5c323ec669372f9a61b84e6a6 (cherry-picked from ag/14601670)
diff --git a/service/src/com/android/server/ConnectivityService.java b/service/src/com/android/server/ConnectivityService.java index eb7dccc..564512a 100644 --- a/service/src/com/android/server/ConnectivityService.java +++ b/service/src/com/android/server/ConnectivityService.java
@@ -2223,7 +2223,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()) {