commit 5a7736048830ff73f97e2211629b0110d67c5efb
author paulhu <paulhu@google.com> Fri Aug 23 19:17:33 2019 +0800
committer paulhu <paulhu@google.com> Tue Nov 26 19:26:44 2019 +0800
tree b2dd40700eca947cf0e77dbffa38b789c7415e0f
parent eab09e59ae76e52cd7071c4d3ef6c18961a6046e

[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

src/com/android/phone/PhoneInterfaceManager.java

diff --git a/src/com/android/phone/PhoneInterfaceManager.java b/src/com/android/phone/PhoneInterfaceManager.java
index 8841c34..d10e248 100755
--- a/src/com/android/phone/PhoneInterfaceManager.java
+++ b/src/com/android/phone/PhoneInterfaceManager.java
@@ -2470,9 +2470,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) {
@@ -5915,7 +5914,7 @@
 
     @Override
     public void factoryReset(int subId) {
-        enforceConnectivityInternalPermission();
+        enforceSettingsPermission();
         if (mUserManager.hasUserRestriction(UserManager.DISALLOW_NETWORK_RESET)) {
             return;
         }