add injectSmsPdu with subId to ISms.aidl
Cheuksan Wang [Fri, 3 Apr 2015 19:52:36 +0000 (12:52 -0700)]
also clean up unused methods from ISms.aidl and UiccSmsController.java

BUG: 20015121
Change-Id: Ibd746ded4ac50c004cc7e5e2f629f53e919dfe2d

src/java/android/telephony/SmsManager.java
src/java/com/android/internal/telephony/UiccSmsController.java
tests/telephonytests/src/com/android/internal/telephony/SimSmsTest.java

index a07d141..0ac1fd2 100644 (file)
@@ -301,7 +301,8 @@ public final class SmsManager {
         try {
             ISms iccISms = ISms.Stub.asInterface(ServiceManager.getService("isms"));
             if (iccISms != null) {
-                iccISms.injectSmsPdu(pdu, format, receivedIntent);
+                iccISms.injectSmsPduForSubscriber(
+                        getSubscriptionId(), pdu, format, receivedIntent);
             }
         } catch (RemoteException ex) {
           // ignore it
index 0aff3fe..45a4658 100755 (executable)
@@ -52,13 +52,7 @@ public class UiccSmsController extends ISms.Stub {
         }
     }
 
-    public boolean
-    updateMessageOnIccEf(String callingPackage, int index, int status, byte[] pdu)
-            throws android.os.RemoteException {
-        return  updateMessageOnIccEfForSubscriber(getPreferredSmsSubscription(), callingPackage,
-                index, status, pdu);
-    }
-
+    @Override
     public boolean
     updateMessageOnIccEfForSubscriber(int subId, String callingPackage, int index, int status,
                 byte[] pdu) throws android.os.RemoteException {
@@ -66,53 +60,39 @@ public class UiccSmsController extends ISms.Stub {
         if (iccSmsIntMgr != null) {
             return iccSmsIntMgr.updateMessageOnIccEf(callingPackage, index, status, pdu);
         } else {
-            Rlog.e(LOG_TAG,"updateMessageOnIccEf iccSmsIntMgr is null" +
+            Rlog.e(LOG_TAG,"updateMessageOnIccEfForSubscriber iccSmsIntMgr is null" +
                           " for Subscription: " + subId);
             return false;
         }
     }
 
-    public boolean copyMessageToIccEf(String callingPackage, int status, byte[] pdu, byte[] smsc)
-            throws android.os.RemoteException {
-        return copyMessageToIccEfForSubscriber(getPreferredSmsSubscription(), callingPackage, status,
-                pdu, smsc);
-    }
-
+    @Override
     public boolean copyMessageToIccEfForSubscriber(int subId, String callingPackage, int status,
             byte[] pdu, byte[] smsc) throws android.os.RemoteException {
         IccSmsInterfaceManager iccSmsIntMgr = getIccSmsInterfaceManager(subId);
         if (iccSmsIntMgr != null) {
             return iccSmsIntMgr.copyMessageToIccEf(callingPackage, status, pdu, smsc);
         } else {
-            Rlog.e(LOG_TAG,"copyMessageToIccEf iccSmsIntMgr is null" +
+            Rlog.e(LOG_TAG,"copyMessageToIccEfForSubscriber iccSmsIntMgr is null" +
                           " for Subscription: " + subId);
             return false;
         }
     }
 
-    public List<SmsRawData> getAllMessagesFromIccEf(String callingPackage)
-            throws android.os.RemoteException {
-        return getAllMessagesFromIccEfForSubscriber(getPreferredSmsSubscription(), callingPackage);
-    }
-
+    @Override
     public List<SmsRawData> getAllMessagesFromIccEfForSubscriber(int subId, String callingPackage)
                 throws android.os.RemoteException {
         IccSmsInterfaceManager iccSmsIntMgr = getIccSmsInterfaceManager(subId);
         if (iccSmsIntMgr != null) {
             return iccSmsIntMgr.getAllMessagesFromIccEf(callingPackage);
         } else {
-            Rlog.e(LOG_TAG,"getAllMessagesFromIccEf iccSmsIntMgr is" +
+            Rlog.e(LOG_TAG,"getAllMessagesFromIccEfForSubscriber iccSmsIntMgr is" +
                           " null for Subscription: " + subId);
             return null;
         }
     }
 
-    public void sendData(String callingPackage, String destAddr, String scAddr, int destPort,
-            byte[] data, PendingIntent sentIntent, PendingIntent deliveryIntent) {
-         sendDataForSubscriber(getPreferredSmsSubscription(), callingPackage, destAddr, scAddr,
-                 destPort, data, sentIntent, deliveryIntent);
-    }
-
+    @Override
     public void sendDataForSubscriber(int subId, String callingPackage, String destAddr,
             String scAddr, int destPort, byte[] data, PendingIntent sentIntent,
             PendingIntent deliveryIntent) {
@@ -121,19 +101,14 @@ public class UiccSmsController extends ISms.Stub {
             iccSmsIntMgr.sendData(callingPackage, destAddr, scAddr, destPort, data,
                     sentIntent, deliveryIntent);
         } else {
-            Rlog.e(LOG_TAG,"sendData iccSmsIntMgr is null for" +
+            Rlog.e(LOG_TAG,"sendDataForSubscriber iccSmsIntMgr is null for" +
                           " Subscription: " + subId);
             // TODO: Use a more specific error code to replace RESULT_ERROR_GENERIC_FAILURE.
             sendErrorInPendingIntent(sentIntent, SmsManager.RESULT_ERROR_GENERIC_FAILURE);
         }
     }
 
-    public void sendText(String callingPackage, String destAddr, String scAddr,
-            String text, PendingIntent sentIntent, PendingIntent deliveryIntent) {
-        sendTextForSubscriber(getPreferredSmsSubscription(), callingPackage, destAddr, scAddr,
-            text, sentIntent, deliveryIntent);
-    }
-
+    @Override
     public void sendTextForSubscriber(int subId, String callingPackage, String destAddr,
             String scAddr, String text, PendingIntent sentIntent, PendingIntent deliveryIntent) {
         IccSmsInterfaceManager iccSmsIntMgr = getIccSmsInterfaceManager(subId);
@@ -141,19 +116,13 @@ public class UiccSmsController extends ISms.Stub {
             iccSmsIntMgr.sendText(callingPackage, destAddr, scAddr, text, sentIntent,
                     deliveryIntent);
         } else {
-            Rlog.e(LOG_TAG,"sendText iccSmsIntMgr is null for" +
+            Rlog.e(LOG_TAG,"sendTextForSubscriber iccSmsIntMgr is null for" +
                           " Subscription: " + subId);
             sendErrorInPendingIntent(sentIntent, SmsManager.RESULT_ERROR_GENERIC_FAILURE);
         }
     }
 
-    public void sendMultipartText(String callingPackage, String destAddr, String scAddr,
-            List<String> parts, List<PendingIntent> sentIntents,
-            List<PendingIntent> deliveryIntents) throws android.os.RemoteException {
-         sendMultipartTextForSubscriber(getPreferredSmsSubscription(), callingPackage, destAddr,
-                 scAddr, parts, sentIntents, deliveryIntents);
-    }
-
+    @Override
     public void sendMultipartTextForSubscriber(int subId, String callingPackage, String destAddr,
             String scAddr, List<String> parts, List<PendingIntent> sentIntents,
             List<PendingIntent> deliveryIntents)
@@ -163,72 +132,53 @@ public class UiccSmsController extends ISms.Stub {
             iccSmsIntMgr.sendMultipartText(callingPackage, destAddr, scAddr, parts, sentIntents,
                     deliveryIntents);
         } else {
-            Rlog.e(LOG_TAG,"sendMultipartText iccSmsIntMgr is null for" +
+            Rlog.e(LOG_TAG,"sendMultipartTextForSubscriber iccSmsIntMgr is null for" +
                           " Subscription: " + subId);
             sendErrorInPendingIntents(sentIntents, SmsManager.RESULT_ERROR_GENERIC_FAILURE);
         }
     }
 
-    public boolean enableCellBroadcast(int messageIdentifier, int ranType)
-            throws android.os.RemoteException {
-        return enableCellBroadcastForSubscriber(getPreferredSmsSubscription(), messageIdentifier,
-                ranType);
-    }
-
+    @Override
     public boolean enableCellBroadcastForSubscriber(int subId, int messageIdentifier, int ranType)
                 throws android.os.RemoteException {
         return enableCellBroadcastRangeForSubscriber(subId, messageIdentifier, messageIdentifier,
                 ranType);
     }
 
-    public boolean enableCellBroadcastRange(int startMessageId, int endMessageId, int ranType)
-            throws android.os.RemoteException {
-        return enableCellBroadcastRangeForSubscriber(getPreferredSmsSubscription(), startMessageId,
-                endMessageId, ranType);
-    }
-
+    @Override
     public boolean enableCellBroadcastRangeForSubscriber(int subId, int startMessageId,
             int endMessageId, int ranType) throws android.os.RemoteException {
         IccSmsInterfaceManager iccSmsIntMgr = getIccSmsInterfaceManager(subId);
         if (iccSmsIntMgr != null ) {
             return iccSmsIntMgr.enableCellBroadcastRange(startMessageId, endMessageId, ranType);
         } else {
-            Rlog.e(LOG_TAG,"enableCellBroadcast iccSmsIntMgr is null for" +
+            Rlog.e(LOG_TAG,"enableCellBroadcastRangeForSubscriber iccSmsIntMgr is null for" +
                           " Subscription: " + subId);
         }
         return false;
     }
 
-    public boolean disableCellBroadcast(int messageIdentifier, int ranType)
-            throws android.os.RemoteException {
-        return disableCellBroadcastForSubscriber(getPreferredSmsSubscription(), messageIdentifier,
-                ranType);
-    }
-
+    @Override
     public boolean disableCellBroadcastForSubscriber(int subId, int messageIdentifier, int ranType)
                 throws android.os.RemoteException {
         return disableCellBroadcastRangeForSubscriber(subId, messageIdentifier, messageIdentifier,
                 ranType);
     }
 
-    public boolean disableCellBroadcastRange(int startMessageId, int endMessageId, int ranType)
-            throws android.os.RemoteException {
-        return disableCellBroadcastRangeForSubscriber(getPreferredSmsSubscription(), startMessageId,
-                endMessageId, ranType);
-    }
-
+    @Override
     public boolean disableCellBroadcastRangeForSubscriber(int subId, int startMessageId,
             int endMessageId, int ranType) throws android.os.RemoteException {
         IccSmsInterfaceManager iccSmsIntMgr = getIccSmsInterfaceManager(subId);
         if (iccSmsIntMgr != null ) {
             return iccSmsIntMgr.disableCellBroadcastRange(startMessageId, endMessageId, ranType);
         } else {
-            Rlog.e(LOG_TAG,"disableCellBroadcast iccSmsIntMgr is null for" +
+            Rlog.e(LOG_TAG,"disableCellBroadcastRangeForSubscriber iccSmsIntMgr is null for" +
                           " Subscription:"+subId);
         }
        return false;
     }
 
+    @Override
     public int getPremiumSmsPermission(String packageName) {
         return getPremiumSmsPermissionForSubscriber(getPreferredSmsSubscription(), packageName);
     }
@@ -239,12 +189,13 @@ public class UiccSmsController extends ISms.Stub {
         if (iccSmsIntMgr != null ) {
             return iccSmsIntMgr.getPremiumSmsPermission(packageName);
         } else {
-            Rlog.e(LOG_TAG, "getPremiumSmsPermission iccSmsIntMgr is null");
+            Rlog.e(LOG_TAG, "getPremiumSmsPermissionForSubscriber iccSmsIntMgr is null");
         }
         //TODO Rakesh
         return 0;
     }
 
+    @Override
     public void setPremiumSmsPermission(String packageName, int permission) {
          setPremiumSmsPermissionForSubscriber(getPreferredSmsSubscription(), packageName, permission);
     }
@@ -255,21 +206,17 @@ public class UiccSmsController extends ISms.Stub {
         if (iccSmsIntMgr != null ) {
             iccSmsIntMgr.setPremiumSmsPermission(packageName, permission);
         } else {
-            Rlog.e(LOG_TAG, "setPremiumSmsPermission iccSmsIntMgr is null");
+            Rlog.e(LOG_TAG, "setPremiumSmsPermissionForSubscriber iccSmsIntMgr is null");
         }
     }
 
-    public boolean isImsSmsSupported() {
-        return isImsSmsSupportedForSubscriber(getPreferredSmsSubscription());
-    }
-
     @Override
     public boolean isImsSmsSupportedForSubscriber(int subId) {
         IccSmsInterfaceManager iccSmsIntMgr = getIccSmsInterfaceManager(subId);
         if (iccSmsIntMgr != null ) {
             return iccSmsIntMgr.isImsSmsSupported();
         } else {
-            Rlog.e(LOG_TAG, "isImsSmsSupported iccSmsIntMgr is null");
+            Rlog.e(LOG_TAG, "isImsSmsSupportedForSubscriber iccSmsIntMgr is null");
         }
         return false;
     }
@@ -307,32 +254,25 @@ public class UiccSmsController extends ISms.Stub {
         return false;
     }
 
-    public String getImsSmsFormat() {
-        return getImsSmsFormatForSubscriber(getPreferredSmsSubscription());
-    }
-
     @Override
     public String getImsSmsFormatForSubscriber(int subId) {
-       IccSmsInterfaceManager iccSmsIntMgr = getIccSmsInterfaceManager(subId);
+        IccSmsInterfaceManager iccSmsIntMgr = getIccSmsInterfaceManager(subId);
         if (iccSmsIntMgr != null ) {
             return iccSmsIntMgr.getImsSmsFormat();
         } else {
-            Rlog.e(LOG_TAG, "getImsSmsFormat iccSmsIntMgr is null");
+            Rlog.e(LOG_TAG, "getImsSmsFormatForSubscriber iccSmsIntMgr is null");
         }
         return null;
     }
 
     @Override
-    public void injectSmsPdu(byte[] pdu, String format, PendingIntent receivedIntent) {
-        injectSmsPdu(SubscriptionManager.getDefaultSmsSubId(), pdu, format, receivedIntent);
-    }
-
-    // FIXME: Add injectSmsPdu to ISms.aidl
-    public void injectSmsPdu(int subId, byte[] pdu, String format, PendingIntent receivedIntent) {
+    public void injectSmsPduForSubscriber(
+            int subId, byte[] pdu, String format, PendingIntent receivedIntent) {
         IccSmsInterfaceManager iccSmsIntMgr = getIccSmsInterfaceManager(subId);
         if (iccSmsIntMgr != null) {
             iccSmsIntMgr.injectSmsPdu(pdu, format, receivedIntent);
         } else {
+            Rlog.e(LOG_TAG, "injectSmsPduForSubscriber iccSmsIntMgr is null");
             // RESULT_SMS_GENERIC_ERROR is documented for injectSmsPdu
             sendErrorInPendingIntent(receivedIntent, Intents.RESULT_SMS_GENERIC_ERROR);
         }
@@ -370,6 +310,7 @@ public class UiccSmsController extends ISms.Stub {
 
     /**
        Gets User preferred SMS subscription */
+    @Override
     public int getPreferredSmsSubscription() {
         return SubscriptionController.getInstance().getDefaultSmsSubId();
     }
@@ -377,6 +318,7 @@ public class UiccSmsController extends ISms.Stub {
     /**
      * Get SMS prompt property,  enabled or not
      **/
+    @Override
     public boolean isSMSPromptEnabled() {
         return PhoneFactory.isSMSPromptEnabled();
     }
index 8b9fd2e..7dc5777 100644 (file)
@@ -34,7 +34,9 @@ public class SimSmsTest extends TestCase {
         ISms sms = ISms.Stub.asInterface(ServiceManager.getService("isms"));
         assertNotNull(sms);
 
-        List<SmsRawData> records = sms.getAllMessagesFromIccEf(ActivityThread.currentPackageName());
+        int preferredSmsSubscription = sms.getPreferredSmsSubscription();
+        List<SmsRawData> records = sms.getAllMessagesFromIccEfForSubscriber(
+                preferredSmsSubscription, ActivityThread.currentPackageName());
         assertNotNull(records);
         assertTrue(records.size() >= 0);