commit 423b5f224ebd9473ad6e60b4eebcff35ae7a0a53
author paulhu <paulhu@google.com> Fri Aug 23 19:17:33 2019 +0800
committer paulhu <paulhu@google.com> Tue Nov 26 19:06:14 2019 +0800
tree b7c0ac88ec5e9abc24b0bd058da7f2f3d19eaeda
parent 42f9abe0dd3658a307fc6c9c838d5473980adcea

[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

AndroidManifest.xml

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 9f90866..f0fff9e 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -159,7 +159,8 @@
     <uses-permission android:name="android.permission.MANAGE_USERS" />
     <uses-permission android:name="android.permission.UPDATE_APP_OPS_STATS" />
     <uses-permission android:name="android.permission.MANAGE_APP_OPS_MODES" />
-    <uses-permission android:name="android.permission.CONNECTIVITY_INTERNAL" />
+    <uses-permission android:name="android.permission.NETWORK_FACTORY" />
+    <uses-permission android:name="android.permission.OBSERVE_NETWORK_POLICY" />
     <uses-permission android:name="android.permission.SET_PREFERRED_APPLICATIONS" />
     <uses-permission android:name="android.permission.READ_SEARCH_INDEXABLES" />
     <uses-permission android:name="android.permission.DUMP" />

src/com/android/phone/PhoneInterfaceManager.java

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;
         }