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

Commit e2595f3a authored by Cheuksan Wang's avatar Cheuksan Wang Committed by Natiq Ahmed
Browse files

new SMS/MMS carrier app API. 

Changes based on api council review

BUG: 18005911
Change-Id: I23bd207ce70f7fa201d6d964c1700cfc44cb009b
parent c8a770d6

Android.mk

+3 −4
Original line number Diff line number Diff line
@@ -215,8 +215,8 @@ LOCAL_SRC_FILES += \ 
	core/java/android/os/IUpdateLock.aidl \

	core/java/android/os/IUserManager.aidl \

	core/java/android/os/IVibratorService.aidl \

	core/java/android/service/carriermessaging/ICarrierMessagingCallback.aidl \

	core/java/android/service/carriermessaging/ICarrierMessagingService.aidl \

	core/java/android/service/carrier/ICarrierMessagingCallback.aidl \

	core/java/android/service/carrier/ICarrierMessagingService.aidl \

	core/java/android/service/notification/INotificationListener.aidl \

	core/java/android/service/notification/IStatusBarNotificationHolder.aidl \

	core/java/android/service/notification/IConditionListener.aidl \
@@ -540,8 +540,7 @@ aidl_files := \ 
	frameworks/base/core/java/android/view/textservice/SpellCheckerInfo.aidl \

	frameworks/base/core/java/android/view/textservice/SentenceSuggestionsInfo.aidl \

	frameworks/base/core/java/android/view/textservice/SuggestionsInfo.aidl \

	frameworks/base/core/java/android/service/carriermessaging/MessagePdu.aidl \

	frameworks/base/core/java/android/service/carriermessaging/CarrierMessagingService.aidl \

	frameworks/base/core/java/android/service/carrier/MessagePdu.aidl \

	frameworks/base/core/java/android/service/notification/StatusBarNotification.aidl \

	frameworks/base/core/java/android/speech/tts/Voice.aidl \

	frameworks/base/core/java/android/app/usage/UsageEvents.aidl \

api/current.txt

+22 −47
Original line number Diff line number Diff line
@@ -26925,71 +26925,46 @@ package android.security { 








}

















package android.service.carriermessaging {









package android.service.carrier {

















  public abstract class CarrierMessagingService extends android.app.Service {









    ctor public CarrierMessagingService();









    method public android.os.IBinder onBind(android.content.Intent);









    method public int onDownloadMms(android.net.Uri, java.lang.String);









    method public boolean onFilterSms(android.service.carriermessaging.MessagePdu, java.lang.String, int);









    method public android.service.carriermessaging.CarrierMessagingService.SendSmsResponse onSendDataSms(byte[], java.lang.String, java.lang.String, int);









    method public android.service.carriermessaging.CarrierMessagingService.SendMmsResult onSendMms(android.net.Uri, java.lang.String);









    method public java.util.List<android.service.carriermessaging.CarrierMessagingService.SendSmsResponse> onSendMultipartTextSms(java.util.List<java.lang.String>, java.lang.String, java.lang.String);









    method public android.service.carriermessaging.CarrierMessagingService.SendSmsResponse onSendTextSms(java.lang.String, java.lang.String, java.lang.String);









    method public void onDownloadMms(android.net.Uri, int, android.net.Uri, android.service.carrier.CarrierMessagingService.ResultCallback<java.lang.Integer>);









    method public void onFilterSms(android.service.carrier.MessagePdu, java.lang.String, int, int, android.service.carrier.CarrierMessagingService.ResultCallback<java.lang.Boolean>);









    method public void onSendDataSms(byte[], int, java.lang.String, int, android.service.carrier.CarrierMessagingService.ResultCallback<android.service.carrier.CarrierMessagingService.SendSmsResult>);









    method public void onSendMms(android.net.Uri, int, android.net.Uri, android.service.carrier.CarrierMessagingService.ResultCallback<android.service.carrier.CarrierMessagingService.SendMmsResult>);









    method public void onSendMultipartTextSms(java.util.List<java.lang.String>, int, java.lang.String, android.service.carrier.CarrierMessagingService.ResultCallback<android.service.carrier.CarrierMessagingService.SendMultipartSmsResult>);









    method public void onSendTextSms(java.lang.String, int, java.lang.String, android.service.carrier.CarrierMessagingService.ResultCallback<android.service.carrier.CarrierMessagingService.SendSmsResult>);









    field public static final int DOWNLOAD_STATUS_ERROR = 2; // 0x2









    field public static final int DOWNLOAD_STATUS_OK = 0; // 0x0









    field public static final int DOWNLOAD_STATUS_RETRY_ON_CARRIER_NETWORK = 1; // 0x1









    field public static final int SEND_STATUS_ERROR = 2; // 0x2









    field public static final int SEND_STATUS_OK = 0; // 0x0









    field public static final int SEND_STATUS_RETRY_ON_CARRIER_NETWORK = 1; // 0x1









    field public static final java.lang.String SERVICE_INTERFACE = "android.service.carriermessaging.CarrierMessagingService";









    field public static final java.lang.String SERVICE_INTERFACE = "android.service.carrier.CarrierMessagingService";









  }

















  public static abstract interface CarrierMessagingService.ResultCallback {









    method public abstract void onReceiveResult(T) throws android.os.RemoteException;









  }

















  public static final class CarrierMessagingService.SendMmsResult {









    ctor public CarrierMessagingService.SendMmsResult(int, byte[]);









    method public int getResult();









    method public byte[] getSendConfPdu();









    method public int getSendStatus();









  }

















  public static final class CarrierMessagingService.SendSmsResponse implements android.os.Parcelable {









    ctor public CarrierMessagingService.SendSmsResponse(int, byte[], int);









    method public int describeContents();









    method public byte[] getAckPdu();









    method public int getErrorCode();









    method public int getMessageRef();









    method public void writeToParcel(android.os.Parcel, int);









    field public static final android.os.Parcelable.Creator<android.service.carriermessaging.CarrierMessagingService.SendSmsResponse> CREATOR;









  public static final class CarrierMessagingService.SendMultipartSmsResult {









    ctor public CarrierMessagingService.SendMultipartSmsResult(int, int[]);









    method public int[] getMessageRefs();









    method public int getSendStatus();









  }

















  public abstract interface ICarrierMessagingCallback implements android.os.IInterface {









    method public abstract void onDownloadMmsComplete(int) throws android.os.RemoteException;









    method public abstract void onFilterComplete(boolean) throws android.os.RemoteException;









    method public abstract void onSendMmsComplete(int, byte[]) throws android.os.RemoteException;









    method public abstract void onSendMultipartSmsComplete(int, java.util.List<android.service.carriermessaging.CarrierMessagingService.SendSmsResponse>) throws android.os.RemoteException;









    method public abstract void onSendSmsComplete(int, android.service.carriermessaging.CarrierMessagingService.SendSmsResponse) throws android.os.RemoteException;









  }

















  public static abstract class ICarrierMessagingCallback.Stub extends android.os.Binder implements android.service.carriermessaging.ICarrierMessagingCallback {









    ctor public ICarrierMessagingCallback.Stub();









    method public android.os.IBinder asBinder();









    method public static android.service.carriermessaging.ICarrierMessagingCallback asInterface(android.os.IBinder);









    method public boolean onTransact(int, android.os.Parcel, android.os.Parcel, int) throws android.os.RemoteException;









  }

















  public abstract interface ICarrierMessagingService implements android.os.IInterface {









    method public abstract void downloadMms(android.net.Uri, java.lang.String, android.service.carriermessaging.ICarrierMessagingCallback) throws android.os.RemoteException;









    method public abstract void filterSms(android.service.carriermessaging.MessagePdu, java.lang.String, int, android.service.carriermessaging.ICarrierMessagingCallback) throws android.os.RemoteException;









    method public abstract void sendDataSms(byte[], java.lang.String, java.lang.String, int, android.service.carriermessaging.ICarrierMessagingCallback) throws android.os.RemoteException;









    method public abstract void sendMms(android.net.Uri, java.lang.String, android.service.carriermessaging.ICarrierMessagingCallback) throws android.os.RemoteException;









    method public abstract void sendMultipartTextSms(java.util.List<java.lang.String>, java.lang.String, java.lang.String, android.service.carriermessaging.ICarrierMessagingCallback) throws android.os.RemoteException;









    method public abstract void sendTextSms(java.lang.String, java.lang.String, java.lang.String, android.service.carriermessaging.ICarrierMessagingCallback) throws android.os.RemoteException;









  }

















  public static abstract class ICarrierMessagingService.Stub extends android.os.Binder implements android.service.carriermessaging.ICarrierMessagingService {









    ctor public ICarrierMessagingService.Stub();









    method public android.os.IBinder asBinder();









    method public static android.service.carriermessaging.ICarrierMessagingService asInterface(android.os.IBinder);









    method public boolean onTransact(int, android.os.Parcel, android.os.Parcel, int) throws android.os.RemoteException;









  public static final class CarrierMessagingService.SendSmsResult {









    ctor public CarrierMessagingService.SendSmsResult(int, int);









    method public int getMessageRef();









    method public int getSendStatus();









  }

















  public final class MessagePdu implements android.os.Parcelable {








@@ -26997,7 +26972,7 @@ package android.service.carriermessaging {







    method public int describeContents();









    method public java.util.List<byte[]> getPdus();









    method public void writeToParcel(android.os.Parcel, int);









    field public static final android.os.Parcelable.Creator<android.service.carriermessaging.MessagePdu> CREATOR;









    field public static final android.os.Parcelable.Creator<android.service.carrier.MessagePdu> CREATOR;









  }

















}

























core/java/android/service/carriermessaging/CarrierMessagingService.aidl
deleted100644 → 0



+0
−19






























Original line number
Diff line number
Diff line









/**









 * Copyright (c) 2014, The Android Open Source Project









 *









 * Licensed under the Apache License, Version 2.0 (the "License");









 * you may not use this file except in compliance with the License.









 * You may obtain a copy of the License at









 *









 *     http://www.apache.org/licenses/LICENSE-2.0









 *









 * Unless required by applicable law or agreed to in writing, software









 * distributed under the License is distributed on an "AS IS" BASIS,









 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.









 * See the License for the specific language governing permissions and









 * limitations under the License.









 */



















package android.service.carriermessaging;



















parcelable CarrierMessagingService.SendSmsResponse;








 No newline at end of file
























core/java/android/service/carriermessaging/CarrierMessagingService.java
deleted100644 → 0



+0
−370






























Original line number
Diff line number
Diff line









/*









 * Copyright (C) 2014 The Android Open Source Project









 *









 * Licensed under the Apache License, Version 2.0 (the "License");









 * you may not use this file except in compliance with the License.









 * You may obtain a copy of the License at









 *









 *      http://www.apache.org/licenses/LICENSE-2.0









 *









 * Unless required by applicable law or agreed to in writing, software









 * distributed under the License is distributed on an "AS IS" BASIS,









 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.









 * See the License for the specific language governing permissions and









 * limitations under the License.









 */



















package android.service.carriermessaging;



















import android.annotation.Nullable;









import android.annotation.SdkConstant;









import android.app.Service;









import android.content.Intent;









import android.net.Uri;









import android.os.IBinder;









import android.os.Parcel;









import android.os.Parcelable;









import android.os.RemoteException;



















import java.util.List;



















/**









 * A service that receives calls from the system when new SMS and MMS are









 * sent or received.









 * <p>To extend this class, you must declare the service in your manifest file with









 * the {@link android.Manifest.permission#BIND_CARRIER_MESSAGING_SERVICE} permission









 * and include an intent filter with the {@link #SERVICE_INTERFACE} action. For example:</p>









 * <pre>









 * &lt;service android:name=".MyMessagingService"









 *          android:label="&#64;string/service_name"









 *          android:permission="android.permission.BIND_CARRIER_MESSAGING_SERVICE">









 *     &lt;intent-filter>









 *         &lt;action android:name="android.service.carriermessaging.CarrierMessagingService" />









 *     &lt;/intent-filter>









 * &lt;/service></pre>









 */









public abstract class CarrierMessagingService extends Service {









    /**









     * The {@link android.content.Intent} that must be declared as handled by the service.









     */









    @SdkConstant(SdkConstant.SdkConstantType.SERVICE_ACTION)









    public static final String SERVICE_INTERFACE









            = "android.service.carriermessaging.CarrierMessagingService";



















    /**









     * Indicates that an SMS or MMS message was successfully sent.









     */









    public static final int SEND_STATUS_OK = 0;



















    /**









     * SMS/MMS sending failed. We should retry via the carrier network.









     */









    public static final int SEND_STATUS_RETRY_ON_CARRIER_NETWORK = 1;



















    /**









     * SMS/MMS sending failed. We should not retry via the carrier network.









     */









    public static final int SEND_STATUS_ERROR = 2;



















    /**









     * Successfully downloaded an MMS message.









     */









    public static final int DOWNLOAD_STATUS_OK = 0;



















    /**









     * MMS downloading failed. We should retry via the carrier network.









     */









    public static final int DOWNLOAD_STATUS_RETRY_ON_CARRIER_NETWORK = 1;



















    /**









     * MMS downloading failed. We should not retry via the carrier network.









     */









    public static final int DOWNLOAD_STATUS_ERROR = 2;



















    private final ICarrierMessagingWrapper mWrapper = new ICarrierMessagingWrapper();



















    /**









     * Implement this method to filter SMS messages.









     *









     * @param pdu the PDUs of the message









     * @param format the format of the PDUs, typically "3gpp" or "3gpp2"









     * @param destPort the destination port of a binary SMS, this will be -1 for text SMS









     *









     * @return True to keep an inbound SMS message and delivered to SMS apps. False to









     * drop the message.









     */









    public boolean onFilterSms(MessagePdu pdu, String format, int destPort) {









        // optional









        return true;









    }



















    /**









     * Implement this method to intercept text SMSs sent from the devcie.









     *









     * @param text the text to send









     * @param format the format of the response PDU, typically "3gpp" or "3gpp2"









     * @param destAddress phone number of the recipient of the message









     *









     * @return a {@link SendSmsResponse}.









     */









    public SendSmsResponse onSendTextSms(String text, String format, String destAddress) {









        // optional









        return null;









    }



















    /**









     * Implement this method to intercept binary SMSs sent from the device.









     *









     * @param data the binary content









     * @param format format the format of the response PDU, typically "3gpp" or "3gpp2"









     * @param destAddress phone number of the recipient of the message









     * @param destPort the destination port









     *









     * @return a {@link SendSmsResponse}









     */









    public SendSmsResponse onSendDataSms(byte[] data, String format, String destAddress,









            int destPort) {









        // optional









        return null;









    }



















    /**









     * Implement this method to intercept long SMSs sent from the device.









     *









     * @param parts a {@link List} of the message parts









     * @param format format the format of the response PDU, typically "3gpp" or "3gpp2"









     * @param destAddress phone number of the recipient of the message









     *









     * @return a {@link List} of {@link SendSmsResponse}, one for each message part.









     */









    public List<SendSmsResponse> onSendMultipartTextSms(List<String> parts, String format,









            String destAddress) {









        // optional









        return null;









    }



















    /**









     * Implement this method to intercept MMSs sent from the device.









     *









     * @param pduUri the content provider URI of the PDU to send









     * @param locationUrl the optional URL to send this MMS PDU. If this is not specified,









     *                    the PDU should be sent to the default MMSC URL.









     *









     * @return a {@link SendMmsResult}.









     */









    public SendMmsResult onSendMms(Uri pduUri, @Nullable String locationUrl) {









        // optional









        return null;









    }



















    /**









     * Implement this method to download MMSs received.









     *









     * @param contentUri the content provider URI of the PDU to be downloaded.









     * @param locationUrl the URL of the message to be downloaded.









     *









     * @return a {@link SendMmsResult}.









     */









    public int onDownloadMms(Uri contentUri, String locationUrl) {









        // optional









        return DOWNLOAD_STATUS_RETRY_ON_CARRIER_NETWORK;









    }



















    @Override









    public IBinder onBind(Intent intent) {









        if (!SERVICE_INTERFACE.equals(intent.getAction())) {









            return null;









        }









        return mWrapper;









    }



















    /**









     * The result of sending an MMS.









     */









    public static final class SendMmsResult {









        private int mResult;









        private byte[] mSendConfPdu;



















        public SendMmsResult(int result, byte[] sendConfPdu) {









            mResult = result;









            mSendConfPdu = sendConfPdu;









        }



















        /**









         * @return the result which is one of {@link #SEND_STATUS_OK},









         *         {@link #SEND_STATUS_RETRY_ON_CARRIER_NETWORK}, and {@link #SEND_STATUS_ERROR}









         */









        public int getResult() {









            return mResult;









        }



















        /**









         * @return the SendConf PDU, which confirms that the message was sent.









         */









        public byte[] getSendConfPdu() {









            return mSendConfPdu;









        }









    }



















    /**









     * Object passed in callbacks upon successful completion of









     * {@link ICarrierMessagingService#sendTextSms},









     * {@link ICarrierMessagingService#sendDataSms}, and









     * {@link ICarrierMessagingService#sendMultipartTextSms}.









     * Contains message reference and ackPdu.









     */









    public static final class SendSmsResponse implements Parcelable {









        private int mMessageRef;









        private byte[] mAckPdu;









        private int mErrorCode;



















        /**









         * @param messageRef message reference of the just-sent SMS









         * @param ackPdu ackPdu for the just-sent SMS









         * @param errorCode error code. See 3GPP 27.005, 3.2.5 for GSM/UMTS,









         *     3GPP2 N.S0005 (IS-41C) Table 171 for CDMA, -1 if unknown or not applicable.









         */









        public SendSmsResponse(int messageRef, byte[] ackPdu, int errorCode) {









            mMessageRef = messageRef;









            mAckPdu = ackPdu;









            mErrorCode = errorCode;









        }



















        /**









         * Returns the message reference of the just-sent SMS.









         *









         * @return the message reference









         */









        public int getMessageRef() {









            return mMessageRef;









        }



















        /**









         * Returns the ackPdu for the just-sent SMS.









         *









         * @return the ackPdu









         */









        public byte[] getAckPdu() {









            return mAckPdu;









        }



















        /**









         * Returns the error code upon encountering an error while sending the SMS, -1 if unknown or









         * not applicable.









         *









         * @return errorCode the errorCode as defined in 3GPP 27.005, 3.2.5 for GSM/UMTS, and 3GPP2









         * N.S0005 (IS-41C) Table 171 for CDMA, -1 if unknown or not applicable.









         */









        public int getErrorCode() {









            return mErrorCode;









        }



















        @Override









        public int describeContents() {









            return 0;









        }



















        @Override









        public void writeToParcel(Parcel dest, int flags) {









            dest.writeInt(mMessageRef);









            dest.writeByteArray(mAckPdu);









            dest.writeInt(mErrorCode);









        }



















        public static final Parcelable.Creator<SendSmsResponse> CREATOR









                = new Parcelable.Creator<SendSmsResponse>() {









                    @Override









                    public SendSmsResponse createFromParcel(Parcel source) {









                        return new SendSmsResponse(source.readInt(),









                                                   source.createByteArray(),









                                                   source.readInt());









                    }



















                    @Override









                    public SendSmsResponse[] newArray(int size) {









                        return new SendSmsResponse[size];









                    }









        };









    }



















    /**









     * A wrapper around ICarrierMessagingService to enable the carrier messaging APP to implement









     * methods it cares about in the {@link ICarrierMessagingService} interface.









     */









    private class ICarrierMessagingWrapper extends ICarrierMessagingService.Stub {









        @Override









        public void filterSms(MessagePdu pdu, String format, int destPort,









                              ICarrierMessagingCallback callback) {









            try {









                callback.onFilterComplete(onFilterSms(pdu, format, destPort));









            } catch (RemoteException ex) {









            }









        }



















        @Override









        public void sendTextSms(String text, String format, String destAddress,









                                ICarrierMessagingCallback callback) {









            try {









                SendSmsResponse sendSmsResponse = onSendTextSms(text, format, destAddress);









                if (sendSmsResponse == null) {









                    callback.onSendSmsComplete(SEND_STATUS_RETRY_ON_CARRIER_NETWORK, null);









                } else {









                    callback.onSendSmsComplete(SEND_STATUS_OK, sendSmsResponse);









                }









            } catch (RemoteException ex) {









            }









        }



















        @Override









        public void sendDataSms(byte[] data, String format, String destAddress, int destPort,









                                ICarrierMessagingCallback callback) {









            try {









                SendSmsResponse sendSmsResponse = onSendDataSms(data, format, destAddress,









                        destPort);









                if (sendSmsResponse == null) {









                    callback.onSendSmsComplete(SEND_STATUS_RETRY_ON_CARRIER_NETWORK, null);









                } else {









                    callback.onSendSmsComplete(SEND_STATUS_OK, sendSmsResponse);









                }









            } catch (RemoteException ex) {









            }









        }



















        @Override









        public void sendMultipartTextSms(List<String> parts, String format, String destAddress,









                                         ICarrierMessagingCallback callback) {









            try {









                List<SendSmsResponse> sendSmsResponses =









                        onSendMultipartTextSms(parts, format, destAddress);









                if (sendSmsResponses == null) {









                    callback.onSendMultipartSmsComplete(SEND_STATUS_RETRY_ON_CARRIER_NETWORK, null);









                } else {









                    callback.onSendMultipartSmsComplete(SEND_STATUS_OK, sendSmsResponses);









                }









            } catch (RemoteException ex) {









            }









        }



















        @Override









        public void sendMms(Uri pduUri, String locationUrl, ICarrierMessagingCallback callback) {









            try {









                SendMmsResult result = onSendMms(pduUri, locationUrl);









                if (result == null) {









                    callback.onSendMmsComplete(SEND_STATUS_RETRY_ON_CARRIER_NETWORK, null);









                } else {









                    callback.onSendMmsComplete(SEND_STATUS_OK, result.getSendConfPdu());









                }









            } catch (RemoteException ex) {









            }









        }



















        @Override









        public void downloadMms(Uri contentUri, String locationUrl,









                ICarrierMessagingCallback callback) {









            try {









                callback.onDownloadMmsComplete(onDownloadMms(contentUri, locationUrl));









            } catch (RemoteException ex) {









            }









        }









    }









}
























core/java/android/service/carriermessaging/CarrierMessagingServiceManager.java
deleted100644 → 0



+0
−97




























File deleted.
Preview size limit exceeded, changes collapsed.