Merge "Check NETWORK_SETTINGS permission for getAllNetworkStateSnapshots" into sc-dev am: a99476773f am: 74dddbeb82 am: 9cb6d7475b

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14601670

Change-Id: I800e9ceb40156cc4f96d6a4feebfd621cdc46078
This commit is contained in:
TreeHugger Robot
2021-05-20 05:27:47 +00:00
committed by Automerger Merge Worker

View File

@@ -2213,7 +2213,7 @@ public class ConnectivityService extends IConnectivityManager.Stub
@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()) {