diff options
| author | Ye Wen <ywen@google.com> | 2014-09-25 11:20:08 -0700 |
|---|---|---|
| committer | Ye Wen <ywen@google.com> | 2014-09-25 11:20:08 -0700 |
| commit | 7558bde1209f68baeafc0642b543555719b400c5 (patch) | |
| tree | 542f236c6f8571243d6d1cc3565232f07f3b6733 /api/current.txt | |
| parent | cb6b5f9bd1aa9e83325310ce15c4978d8df3dce6 (diff) | |
| parent | 864a8b667a5f15f60dd0fe0628f536f1cb175756 (diff) | |
| download | frameworks_base-7558bde1209f68baeafc0642b543555719b400c5.zip frameworks_base-7558bde1209f68baeafc0642b543555719b400c5.tar.gz frameworks_base-7558bde1209f68baeafc0642b543555719b400c5.tar.bz2 | |
resolved conflicts for merge of 13ff7c17 to lmp-sprout-dev
Change-Id: Ic27b03fa49bb921c36cd2825bf5486903dfd0317
Diffstat (limited to 'api/current.txt')
| -rw-r--r-- | api/current.txt | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/api/current.txt b/api/current.txt index 113405f..6860fb0 100644 --- a/api/current.txt +++ b/api/current.txt @@ -25584,10 +25584,6 @@ 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"; } public static final class Telephony.Mms.Outbox implements android.provider.Telephony.BaseMmsColumns { @@ -25692,10 +25688,8 @@ package android.provider { field public static final java.lang.String SMS_CB_RECEIVED_ACTION = "android.provider.Telephony.SMS_CB_RECEIVED"; field public static final java.lang.String SMS_DELIVER_ACTION = "android.provider.Telephony.SMS_DELIVER"; field public static final java.lang.String SMS_EMERGENCY_CB_RECEIVED_ACTION = "android.provider.Telephony.SMS_EMERGENCY_CB_RECEIVED"; - field public static final java.lang.String SMS_FILTER_ACTION = "android.provider.Telephony.SMS_FILTER"; field public static final java.lang.String SMS_RECEIVED_ACTION = "android.provider.Telephony.SMS_RECEIVED"; field public static final java.lang.String SMS_REJECTED_ACTION = "android.provider.Telephony.SMS_REJECTED"; - field public static final java.lang.String SMS_SEND_ACTION = "android.provider.Telephony.SMS_SEND"; field public static final java.lang.String SMS_SERVICE_CATEGORY_PROGRAM_DATA_RECEIVED_ACTION = "android.provider.Telephony.SMS_SERVICE_CATEGORY_PROGRAM_DATA_RECEIVED"; field public static final java.lang.String WAP_PUSH_DELIVER_ACTION = "android.provider.Telephony.WAP_PUSH_DELIVER"; field public static final java.lang.String WAP_PUSH_RECEIVED_ACTION = "android.provider.Telephony.WAP_PUSH_RECEIVED"; @@ -28380,14 +28374,10 @@ package android.telephony { method public static android.telephony.SmsManager getDefault(); method public static android.telephony.SmsManager getSmsManagerForSubscriber(long); method public long getSubId(); - 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.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(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"; field public static final java.lang.String MMS_CONFIG_ALIAS_MAX_CHARS = "aliasMaxChars"; |