Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 56e02703 authored by Cheuksan Wang's avatar Cheuksan Wang
Browse files

add injectSmsPdu with subId to ISms.aidl 

also clean up unused methods from ISms.aidl and UiccSmsController.java

BUG: 20015121
Change-Id: I60237e2e8964f9db5cceab7b09112a49f92f5c47
parent cf9f5a16

telephony/java/com/android/internal/telephony/ISms.aidl

+9 −215
Original line number Diff line number Diff line
@@ -35,13 +35,6 @@ import com.android.internal.telephony.SmsRawData; 
 */



interface ISms {

    /**

     * Retrieves all messages currently stored on ICC.

     *

     * @return list of SmsRawData of all sms on ICC

     */

     List<SmsRawData> getAllMessagesFromIccEf(String callingPkg);



    /**

     * Retrieves all messages currently stored on ICC.

     * @param subId the subId id.
@@ -49,20 +42,6 @@ interface ISms { 
     */

    List<SmsRawData> getAllMessagesFromIccEfForSubscriber(in int subId, String callingPkg);



    /**

     * Update the specified message on the ICC.

     *

     * @param messageIndex record index of message to update

     * @param newStatus new message status (STATUS_ON_ICC_READ,

     *                  STATUS_ON_ICC_UNREAD, STATUS_ON_ICC_SENT,

     *                  STATUS_ON_ICC_UNSENT, STATUS_ON_ICC_FREE)

     * @param pdu the raw PDU to store

     * @return success or not

     *

     */

     boolean updateMessageOnIccEf(String callingPkg, int messageIndex, int newStatus,

            in byte[] pdu);



    /**

     * Update the specified message on the ICC.

     *
@@ -78,17 +57,6 @@ interface ISms { 
     boolean updateMessageOnIccEfForSubscriber(in int subId, String callingPkg,

             int messageIndex, int newStatus, in byte[] pdu);



    /**

     * Copy a raw SMS PDU to the ICC.

     *

     * @param pdu the raw PDU to store

     * @param status message status (STATUS_ON_ICC_READ, STATUS_ON_ICC_UNREAD,

     *               STATUS_ON_ICC_SENT, STATUS_ON_ICC_UNSENT)

     * @return success or not

     *

     */

    boolean copyMessageToIccEf(String callingPkg, int status, in byte[] pdu, in byte[] smsc);



    /**

     * Copy a raw SMS PDU to the ICC.

     *
@@ -102,32 +70,6 @@ interface ISms { 
    boolean copyMessageToIccEfForSubscriber(in int subId, String callingPkg, int status,

            in byte[] pdu, in byte[] smsc);



    /**

     * Send a data SMS.

     *

     * @param smsc the SMSC to send the message through, or NULL for the

     *  default SMSC

     * @param data the body of the message to send

     * @param sentIntent if not NULL this <code>PendingIntent</code> is

     *  broadcast when the message is sucessfully sent, or failed.

     *  The result code will be <code>Activity.RESULT_OK<code> for success,

     *  or one of these errors:<br>

     *  <code>RESULT_ERROR_GENERIC_FAILURE</code><br>

     *  <code>RESULT_ERROR_RADIO_OFF</code><br>

     *  <code>RESULT_ERROR_NULL_PDU</code><br>

     *  For <code>RESULT_ERROR_GENERIC_FAILURE</code> the sentIntent may include

     *  the extra "errorCode" containing a radio technology specific value,

     *  generally only useful for troubleshooting.<br>

     *  The per-application based SMS control checks sentIntent. If sentIntent

     *  is NULL the caller will be checked against all unknown applicaitons,

     *  which cause smaller number of SMS to be sent in checking period.

     * @param deliveryIntent if not NULL this <code>PendingIntent</code> is

     *  broadcast when the message is delivered to the recipient.  The

     *  raw pdu of the status report is in the extended data ("pdu").

     */

    void sendData(String callingPkg, in String destAddr, in String scAddr, in int destPort,

            in byte[] data, in PendingIntent sentIntent, in PendingIntent deliveryIntent);



    /**

     * Send a data SMS.

     *
@@ -156,32 +98,6 @@ interface ISms { 
            in String scAddr, in int destPort, in byte[] data, in PendingIntent sentIntent,

            in PendingIntent deliveryIntent);



    /**

     * Send an SMS.

     *

     * @param smsc the SMSC to send the message through, or NULL for the

     *  default SMSC

     * @param text the body of the message to send

     * @param sentIntent if not NULL this <code>PendingIntent</code> is

     *  broadcast when the message is sucessfully sent, or failed.

     *  The result code will be <code>Activity.RESULT_OK<code> for success,

     *  or one of these errors:<br>

     *  <code>RESULT_ERROR_GENERIC_FAILURE</code><br>

     *  <code>RESULT_ERROR_RADIO_OFF</code><br>

     *  <code>RESULT_ERROR_NULL_PDU</code><br>

     *  For <code>RESULT_ERROR_GENERIC_FAILURE</code> the sentIntent may include

     *  the extra "errorCode" containing a radio technology specific value,

     *  generally only useful for troubleshooting.<br>

     *  The per-application based SMS control checks sentIntent. If sentIntent

     *  is NULL the caller will be checked against all unknown applications,

     *  which cause smaller number of SMS to be sent in checking period.

     * @param deliveryIntent if not NULL this <code>PendingIntent</code> is

     *  broadcast when the message is delivered to the recipient.  The

     *  raw pdu of the status report is in the extended data ("pdu").

     */

    void sendText(String callingPkg, in String destAddr, in String scAddr, in String text,

            in PendingIntent sentIntent, in PendingIntent deliveryIntent);



    /**

     * Send an SMS.

     *
@@ -213,6 +129,7 @@ interface ISms { 
    /**

     * Inject an SMS PDU into the android platform.

     *

     * @param subId the subId on which the SMS has to be injected.

     * @param pdu is the byte array of pdu to be injected into android application framework

     * @param format is the format of SMS pdu (android.telephony.SmsMessage.FORMAT_3GPP or

     * android.telephony.SmsMessage.FORMAT_3GPP2)
@@ -221,33 +138,8 @@ interface ISms { 
     *  android application framework. This intent is broadcasted at

     *  the same time an SMS received from radio is acknowledged back.

     */

    void injectSmsPdu(in byte[] pdu, String format, in PendingIntent receivedIntent);



    /**

     * Send a multi-part text based SMS.

     *

     * @param destinationAddress the address to send the message to

     * @param scAddress is the service center address or null to use

     *   the current default SMSC

     * @param parts an <code>ArrayList</code> of strings that, in order,

     *   comprise the original message

     * @param sentIntents if not null, an <code>ArrayList</code> of

     *   <code>PendingIntent</code>s (one for each message part) that is

     *   broadcast when the corresponding message part has been sent.

     *   The result code will be <code>Activity.RESULT_OK<code> for success,

     *   or one of these errors:

     *   <code>RESULT_ERROR_GENERIC_FAILURE</code>

     *   <code>RESULT_ERROR_RADIO_OFF</code>

     *   <code>RESULT_ERROR_NULL_PDU</code>.

     * @param deliveryIntents if not null, an <code>ArrayList</code> of

     *   <code>PendingIntent</code>s (one for each message part) that is

     *   broadcast when the corresponding message part has been delivered

     *   to the recipient.  The raw pdu of the status report is in the

     *   extended data ("pdu").

     */

    void sendMultipartText(String callingPkg, in String destinationAddress, in String scAddress,

            in List<String> parts, in List<PendingIntent> sentIntents,

            in List<PendingIntent> deliveryIntents);

    void injectSmsPduForSubscriber(

            int subId, in byte[] pdu, String format, in PendingIntent receivedIntent);



    /**

     * Send a multi-part text based SMS.
@@ -277,24 +169,6 @@ interface ISms { 
            in List<String> parts, in List<PendingIntent> sentIntents,

            in List<PendingIntent> deliveryIntents);



    /**

     * Enable reception of cell broadcast (SMS-CB) messages with the given

     * message identifier and RAN type. The RAN type specify this message ID

     * belong to 3GPP (GSM) or 3GPP2(CDMA). Note that if two different clients

     * enable the same message identifier, they must both disable it for the

     * device to stop receiving those messages.

     *

     * @param messageIdentifier Message identifier as specified in TS 23.041 (3GPP) or

     *   C.R1001-G (3GPP2)

     * @param ranType as defined in class SmsManager, the value can be one of these:

     *    android.telephony.SmsMessage.CELL_BROADCAST_RAN_TYPE_GSM

     *    android.telephony.SmsMessage.CELL_BROADCAST_RAN_TYPE_CDMA

     * @return true if successful, false otherwise

     *

     * @see #disableCellBroadcast(int, int)

     */

    boolean enableCellBroadcast(int messageIdentifier, int ranType);



    /**

     * Enable reception of cell broadcast (SMS-CB) messages with the given

     * message identifier and RAN type. The RAN type specify this message ID
@@ -310,28 +184,10 @@ interface ISms { 
     *    android.telephony.SmsMessage.CELL_BROADCAST_RAN_TYPE_CDMA

     * @return true if successful, false otherwise

     *

     * @see #disableCellBroadcast(int, int)

     * @see #disableCellBroadcastForSubscriber(int, int, int)

     */

    boolean enableCellBroadcastForSubscriber(int subId, int messageIdentifier, int ranType);



    /**

     * Disable reception of cell broadcast (SMS-CB) messages with the given

     * message identifier and RAN type. The RAN type specify this message ID

     * belong to 3GPP (GSM) or 3GPP2(CDMA). Note that if two different clients

     * enable the same message identifier, they must both disable it for the

     * device to stop receiving those messages.

     *

     * @param messageIdentifier Message identifier as specified in TS 23.041 (3GPP) or

     *   C.R1001-G (3GPP2)

     * @param ranType as defined in class SmsManager, the value can be one of these:

     *    android.telephony.SmsMessage.CELL_BROADCAST_RAN_TYPE_GSM

     *    android.telephony.SmsMessage.CELL_BROADCAST_RAN_TYPE_CDMA

     * @return true if successful, false otherwise

     *

     * @see #enableCellBroadcast(int, int)

     */

    boolean disableCellBroadcast(int messageIdentifier, int ranType);



    /**

     * Disable reception of cell broadcast (SMS-CB) messages with the given

     * message identifier and RAN type. The RAN type specify this message ID
@@ -347,30 +203,10 @@ interface ISms { 
     *    android.telephony.SmsMessage.CELL_BROADCAST_RAN_TYPE_CDMA

     * @return true if successful, false otherwise

     *

     * @see #enableCellBroadcast(int, int)

     * @see #enableCellBroadcastForSubscriber(int, int, int)

     */

    boolean disableCellBroadcastForSubscriber(int subId, int messageIdentifier, int ranType);



    /*

     * Enable reception of cell broadcast (SMS-CB) messages with the given

     * message identifier range and RAN type. The RAN type specify this message

     * ID range belong to 3GPP (GSM) or 3GPP2(CDMA). Note that if two different

     * clients enable a message identifier range, they must both disable it for

     * the device to stop receiving those messages.

     *

     * @param startMessageId first message identifier as specified in TS 23.041 (3GPP) or

     *   C.R1001-G (3GPP2)

     * @param endMessageId last message identifier as specified in TS 23.041 (3GPP) or

     *   C.R1001-G (3GPP2)

     * @param ranType as defined in class SmsManager, the value can be one of these:

     *    android.telephony.SmsMessage.CELL_BROADCAST_RAN_TYPE_GSM

     *    android.telephony.SmsMessage.CELL_BROADCAST_RAN_TYPE_CDMA

     * @return true if successful, false otherwise

     *

     * @see #disableCellBroadcastRange(int, int, int)

     */

    boolean enableCellBroadcastRange(int startMessageId, int endMessageId, int ranType);



    /*

     * Enable reception of cell broadcast (SMS-CB) messages with the given

     * message identifier range and RAN type. The RAN type specify this message ID range
@@ -388,31 +224,11 @@ interface ISms { 
     *    android.telephony.SmsMessage.CELL_BROADCAST_RAN_TYPE_CDMA

     * @return true if successful, false otherwise

     *

     * @see #disableCellBroadcastRange(int, int, int)

     * @see #disableCellBroadcastRangeForSubscriber(int, int, int, int)

     */

    boolean enableCellBroadcastRangeForSubscriber(int subId, int startMessageId, int endMessageId,

            int ranType);



    /**

     * Disable reception of cell broadcast (SMS-CB) messages with the given

     * message identifier range and RAN type. The RAN type specify this message ID range

     * belong to 3GPP (GSM) or 3GPP2(CDMA). Note that if two different clients enable

     * a message identifier range, they must both disable it for the device

     * to stop receiving those messages.

     *

     * @param startMessageId first message identifier as specified in TS 23.041 (3GPP) or

     *   C.R1001-G (3GPP2)

     * @param endMessageId last message identifier as specified in TS 23.041 (3GPP) or

     *   C.R1001-G (3GPP2)

     * @param ranType as defined in class SmsManager, the value can be one of these:

     *    android.telephony.SmsMessage.CELL_BROADCAST_RAN_TYPE_GSM

     *    android.telephony.SmsMessage.CELL_BROADCAST_RAN_TYPE_CDMA

     * @return true if successful, false otherwise

     *

     * @see #enableCellBroadcastRange(int, int, int)

     */

    boolean disableCellBroadcastRange(int startMessageId, int endMessageId, int ranType);



    /**

     * Disable reception of cell broadcast (SMS-CB) messages with the given

     * message identifier range and RAN type. The RAN type specify this message ID range
@@ -430,7 +246,7 @@ interface ISms { 
     *    android.telephony.SmsMessage.CELL_BROADCAST_RAN_TYPE_CDMA

     * @return true if successful, false otherwise

     *

     * @see #enableCellBroadcastRange(int, int, int, int)

     * @see #enableCellBroadcastRangeForSubscriber(int, int, int, int)

     */

    boolean disableCellBroadcastRangeForSubscriber(int subId, int startMessageId,

            int endMessageId, int ranType);
@@ -459,23 +275,13 @@ interface ISms { 
     */

    void setPremiumSmsPermissionForSubscriber(int subId, String packageName, int permission);



    /**

     * SMS over IMS is supported if IMS is registered and SMS is supported

     * on IMS.

     *

     * @return true if SMS over IMS is supported, false otherwise

     *

     * @see #getImsSmsFormat()

     */

    boolean isImsSmsSupported();



    /**

     * SMS over IMS is supported if IMS is registered and SMS is supported

     * on IMS.

     * @param subId for subId which isImsSmsSupported is queried

     * @return true if SMS over IMS is supported, false otherwise

     *

     * @see #getImsSmsFormat()

     * @see #getImsSmsFormatForSubscriber(int)

     */

    boolean isImsSmsSupportedForSubscriber(int subId);
@@ -493,18 +299,6 @@ interface ISms { 
     */

    int getPreferredSmsSubscription();



    /**

     * Gets SMS format supported on IMS.  SMS over IMS format is

     * either 3GPP or 3GPP2.

     *

     * @return android.telephony.SmsMessage.FORMAT_3GPP,

     *         android.telephony.SmsMessage.FORMAT_3GPP2

     *      or android.telephony.SmsMessage.FORMAT_UNKNOWN

     *

     * @see #isImsSmsSupported()

     */

    String getImsSmsFormat();



    /**

     * Gets SMS format supported on IMS.  SMS over IMS format is

     * either 3GPP or 3GPP2.
@@ -513,7 +307,7 @@ interface ISms { 
     *         android.telephony.SmsMessage.FORMAT_3GPP2

     *      or android.telephony.SmsMessage.FORMAT_UNKNOWN

     *

     * @see #isImsSmsSupported()

     * @see #isImsSmsSupportedForSubscriber(int)

     */

    String getImsSmsFormatForSubscriber(int subId);