diff options
| author | Cheuksan Wang <edwang@google.com> | 2014-09-12 17:07:48 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-09-12 17:07:49 +0000 |
| commit | a6c52ac6244d2666c48f51a999c78d588b0328f5 (patch) | |
| tree | 3fd4748e7ad6a869bdf16f8cd10e41cb2a4f4e00 /api | |
| parent | 820b70da0245bb2bc48d7b91f7207348514ee61d (diff) | |
| parent | ee04543d58bf570fd77202d6d2cd861476c3daf6 (diff) | |
| download | frameworks_base-a6c52ac6244d2666c48f51a999c78d588b0328f5.zip frameworks_base-a6c52ac6244d2666c48f51a999c78d588b0328f5.tar.gz frameworks_base-a6c52ac6244d2666c48f51a999c78d588b0328f5.tar.bz2 | |
Merge "Send and download MMS via content provider instead of PDU bytes." into lmp-dev
Diffstat (limited to 'api')
| -rw-r--r-- | api/current.txt | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/api/current.txt b/api/current.txt index 1959c79b..9686baf 100644 --- a/api/current.txt +++ b/api/current.txt @@ -25737,6 +25737,8 @@ package android.provider { public static final class Telephony.Mms.Intents { field public static final java.lang.String CONTENT_CHANGED_ACTION = "android.intent.action.CONTENT_CHANGED"; field public static final java.lang.String DELETED_CONTENTS = "deleted_contents"; + field public static final java.lang.String EXTRA_MMS_CONTENT_URI = "android.provider.Telephony.extra.MMS_CONTENT_URI"; + field public static final java.lang.String EXTRA_MMS_LOCATION_URL = "android.provider.Telephony.extra.MMS_LOCATION_URL"; field public static final java.lang.String MMS_DOWNLOAD_ACTION = "android.provider.Telephony.MMS_DOWNLOAD"; field public static final java.lang.String MMS_SEND_ACTION = "android.provider.Telephony.MMS_SEND"; } @@ -28864,16 +28866,16 @@ package android.telephony { public final class SmsManager { method public java.util.ArrayList<java.lang.String> divideMessage(java.lang.String); - method public void downloadMultimediaMessage(java.lang.String, android.net.Uri, android.os.Bundle, android.app.PendingIntent); + method public void downloadMultimediaMessage(android.content.Context, java.lang.String, android.net.Uri, android.os.Bundle, android.app.PendingIntent); method public android.os.Bundle getCarrierConfigValues(); method public static android.telephony.SmsManager getDefault(); method public void injectSmsPdu(byte[], java.lang.String, android.app.PendingIntent); method public void sendDataMessage(java.lang.String, java.lang.String, short, byte[], android.app.PendingIntent, android.app.PendingIntent); - method public void sendMultimediaMessage(android.net.Uri, java.lang.String, android.os.Bundle, android.app.PendingIntent); + method public void sendMultimediaMessage(android.content.Context, android.net.Uri, java.lang.String, android.os.Bundle, android.app.PendingIntent); method public void sendMultipartTextMessage(java.lang.String, java.lang.String, java.util.ArrayList<java.lang.String>, java.util.ArrayList<android.app.PendingIntent>, java.util.ArrayList<android.app.PendingIntent>); method public void sendTextMessage(java.lang.String, java.lang.String, java.lang.String, android.app.PendingIntent, android.app.PendingIntent); - method public void updateMmsDownloadStatus(int, byte[]); - method public void updateMmsSendStatus(int, boolean); + method public void updateMmsDownloadStatus(android.content.Context, int, int, android.net.Uri); + method public void updateMmsSendStatus(android.content.Context, int, byte[], int, android.net.Uri); method public void updateSmsSendStatus(int, boolean); field public static final java.lang.String EXTRA_MMS_DATA = "android.telephony.extra.MMS_DATA"; field public static final java.lang.String MMS_CONFIG_ALIAS_ENABLED = "aliasEnabled"; @@ -28908,6 +28910,7 @@ package android.telephony { field public static final int MMS_ERROR_HTTP_FAILURE = 4; // 0x4 field public static final int MMS_ERROR_INVALID_APN = 2; // 0x2 field public static final int MMS_ERROR_IO_ERROR = 5; // 0x5 + field public static final int MMS_ERROR_RETRY = 6; // 0x6 field public static final int MMS_ERROR_UNABLE_CONNECT_MMS = 3; // 0x3 field public static final int MMS_ERROR_UNSPECIFIED = 1; // 0x1 field public static final int RESULT_ERROR_GENERIC_FAILURE = 1; // 0x1 |