commit d22eaca38b21d894697f532cd28a57d8e6bee121
author Shishir Agrawal <shishir@google.com> Tue Jul 08 10:01:50 2014 -0700
committer Shishir Agrawal <shishir@google.com> Tue Jul 08 10:01:50 2014 -0700
tree 9969b6311271729f6bed6ca43d7a824d2d292a2f
parent 0ca1c80f1ca60966a16169b109e96ac19fa69743

Remove permission SIM_COMMUNICATION.

The permission is replaced by the MODIFY_PHONE_STATE permission which is
System|Signature.

Change-Id: I74dbd242fc0fdbb5884fdc7a5c3f0063424fbfcf

src/com/android/phone/PhoneInterfaceManager.java

diff --git a/src/com/android/phone/PhoneInterfaceManager.java b/src/com/android/phone/PhoneInterfaceManager.java
index 3fc65da..bb46c95 100644
--- a/src/com/android/phone/PhoneInterfaceManager.java
+++ b/src/com/android/phone/PhoneInterfaceManager.java
@@ -1178,15 +1178,6 @@
                 null);
     }
 
-    /**
-     * Make sure the caller has SIM_COMMUNICATION permission.
-     *
-     * @throws SecurityException if the caller does not have the required permission.
-     */
-    private void enforceSimCommunicationPermission() {
-        mApp.enforceCallingOrSelfPermission(android.Manifest.permission.SIM_COMMUNICATION, null);
-    }
-
     private String createTelUrl(String number) {
         if (TextUtils.isEmpty(number)) {
             return null;
@@ -1389,7 +1380,7 @@
 
     @Override
     public int iccOpenLogicalChannel(String AID) {
-        enforceSimCommunicationPermission();
+        enforceModifyPermission();
 
         if (DBG) log("iccOpenLogicalChannel: " + AID);
         Integer channel = (Integer)sendRequest(CMD_OPEN_CHANNEL, AID);
@@ -1399,7 +1390,7 @@
 
     @Override
     public boolean iccCloseLogicalChannel(int channel) {
-        enforceSimCommunicationPermission();
+        enforceModifyPermission();
 
         if (DBG) log("iccCloseLogicalChannel: " + channel);
         if (channel < 0) {
@@ -1413,7 +1404,7 @@
     @Override
     public String iccTransmitApduLogicalChannel(int channel, int cla,
             int command, int p1, int p2, int p3, String data) {
-        enforceSimCommunicationPermission();
+        enforceModifyPermission();
 
         if (DBG) {
             log("iccTransmitApduLogicalChannel: chnl=" + channel + " cla=" + cla +
@@ -1444,7 +1435,7 @@
 
     @Override
     public String sendEnvelopeWithStatus(String content) {
-        enforceSimCommunicationPermission();
+        enforceModifyPermission();
 
         IccIoResult response = (IccIoResult)sendRequest(CMD_SEND_ENVELOPE, content);
         if (response.payload == null) {