commit a6377d9743dfff73ca265b75e02487e85f82272a
author Brad Ebinger <breadley@google.com> Fri Apr 06 09:56:40 2018 -0700
committer Brad Ebinger <breadley@google.com> Wed Jun 06 16:10:29 2018 -0700
tree 30db54ecd6bb98143da72bfac01ceb5b9328222f
parent 4dc095a7636a640cf240721d49f031eb06bfec75

Add correct permissions check for GTS testing

Bug: 77141737
Test: atest GtsImsServiceTests
Merged-In: I1bd3e2280c753b4a7a09e986a253ee45dc6f4211
Change-Id: I0bcd2970ccaf0f20757d87f263a12bc46c7e9299

src/com/android/phone/PhoneInterfaceManager.java

diff --git a/src/com/android/phone/PhoneInterfaceManager.java b/src/com/android/phone/PhoneInterfaceManager.java
index d181e5a..bda90a5 100755
--- a/src/com/android/phone/PhoneInterfaceManager.java
+++ b/src/com/android/phone/PhoneInterfaceManager.java
@@ -2748,7 +2748,11 @@
      * @hide
      */
     public boolean setImsService(int slotId, boolean isCarrierImsService, String packageName) {
-        enforceModifyPermission();
+        int[] subIds = SubscriptionManager.getSubId(slotId);
+        TelephonyPermissions.enforceCallingOrSelfModifyPermissionOrCarrierPrivilege(mApp,
+                (subIds != null ? subIds[0] : SubscriptionManager.INVALID_SUBSCRIPTION_ID),
+                "setImsService");
+
         return PhoneFactory.getImsResolver().overrideImsServiceConfiguration(slotId,
                 isCarrierImsService, packageName);
     }
@@ -2762,7 +2766,11 @@
      * @return the package name of the ImsService configuration.
      */
     public String getImsService(int slotId, boolean isCarrierImsService) {
-        enforceReadPrivilegedPermission();
+        int[] subIds = SubscriptionManager.getSubId(slotId);
+        TelephonyPermissions.enforceCallingOrSelfModifyPermissionOrCarrierPrivilege(mApp,
+                (subIds != null ? subIds[0] : SubscriptionManager.INVALID_SUBSCRIPTION_ID),
+                "getImsService");
+
         return PhoneFactory.getImsResolver().getImsServiceConfiguration(slotId,
                 isCarrierImsService);
     }