[TelephonyService] Replace CONNECTIVITY_INTERNAL permission
Since the permission of all connectivity checks have been
changed from CONNECTIVITY_INTERNAL to another proper permissions
, add the required permission if application still needs to
access those APIs which have permission check. Moreover, replace
CONNECTIVITY_INTERNAL to another proper permission.
Bug: 32963470
Test: atest FrameworksTelephonyTests TeleServiceTests
Change-Id: If05da53bdd6d5a8249e0207776a2c3acf2c62e1a
Merged-In: If05da53bdd6d5a8249e0207776a2c3acf2c62e1a
diff --git a/src/com/android/phone/PhoneInterfaceManager.java b/src/com/android/phone/PhoneInterfaceManager.java
index 27c1a0b..0be8b84 100755
--- a/src/com/android/phone/PhoneInterfaceManager.java
+++ b/src/com/android/phone/PhoneInterfaceManager.java
@@ -2437,9 +2437,8 @@
mApp.enforceCallingOrSelfPermission(android.Manifest.permission.CALL_PHONE, null);
}
- private void enforceConnectivityInternalPermission() {
- mApp.enforceCallingOrSelfPermission(android.Manifest.permission.CONNECTIVITY_INTERNAL,
- "ConnectivityService");
+ private void enforceSettingsPermission() {
+ mApp.enforceCallingOrSelfPermission(android.Manifest.permission.NETWORK_SETTINGS, null);
}
private String createTelUrl(String number) {
@@ -5840,7 +5839,7 @@
@Override
public void factoryReset(int subId) {
- enforceConnectivityInternalPermission();
+ enforceSettingsPermission();
if (mUserManager.hasUserRestriction(UserManager.DISALLOW_NETWORK_RESET)) {
return;
}