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

Commit 29ac679f authored by Cheuksan Wang's avatar Cheuksan Wang Committed by Android Git Automerger
Browse files

am dba26aa2: am 109ec376: Merge "new SMS/MMS carrier app API" into lmp-mr1-dev 

* commit 'dba26aa2':
  new SMS/MMS carrier app API
parents a75b0ad3 dba26aa2

Android.mk

+3 −4
Original line number Diff line number Diff line
@@ -204,8 +204,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 \
@@ -524,8 +524,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
@@ -26912,71 +26912,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 {








@@ -26984,7 +26959,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;









  }

















}