diff options
| author | Ye Wen <ywen@google.com> | 2014-11-18 20:37:02 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-11-18 20:37:02 +0000 |
| commit | 818b239d0025a28dfdedca40ac60ebc85f1fc8ff (patch) | |
| tree | 2394453d9eaf24ca5e117447624f00564f33d1fc | |
| parent | e672db2801c3eedbdf548c71dfa6cf048f91315d (diff) | |
| parent | f984eb42724e66326549d7bf33a7ec1515a7ff3c (diff) | |
| download | frameworks_base-818b239d0025a28dfdedca40ac60ebc85f1fc8ff.zip frameworks_base-818b239d0025a28dfdedca40ac60ebc85f1fc8ff.tar.gz frameworks_base-818b239d0025a28dfdedca40ac60ebc85f1fc8ff.tar.bz2 | |
am f984eb42: Merge "Addressing API review issues for SmsManager (2/3)" into lmp-mr1-dev
* commit 'f984eb42724e66326549d7bf33a7ec1515a7ff3c':
Addressing API review issues for SmsManager (2/3)
| -rw-r--r-- | api/current.txt | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/api/current.txt b/api/current.txt index 9882845..b5055eb 100644 --- a/api/current.txt +++ b/api/current.txt @@ -28512,8 +28512,8 @@ package android.telephony { method public android.os.Bundle getCarrierConfigValues(); method public static android.telephony.SmsManager getDefault(); method public static int getDefaultSmsSubscriptionId(); - method public static android.telephony.SmsManager getSmsManagerForSubscriber(int); - method public int getSubId(); + method public static android.telephony.SmsManager getSmsManagerForSubscriptionId(int); + method public int getSubscriptionId(); 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); @@ -28545,6 +28545,7 @@ package android.telephony { field public static final java.lang.String MMS_CONFIG_NOTIFY_WAP_MMSC_ENABLED = "enabledNotifyWapMMSC"; field public static final java.lang.String MMS_CONFIG_RECIPIENT_LIMIT = "recipientLimit"; field public static final java.lang.String MMS_CONFIG_SEND_MULTIPART_SMS_AS_SEPARATE_MESSAGES = "sendMultipartSmsAsSeparateMessages"; + field public static final java.lang.String MMS_CONFIG_SHOW_CELL_BROADCAST_APP_LINKS = "config_cellBroadcastAppLinks"; field public static final java.lang.String MMS_CONFIG_SMS_DELIVERY_REPORT_ENABLED = "enableSMSDeliveryReports"; field public static final java.lang.String MMS_CONFIG_SMS_TO_MMS_TEXT_LENGTH_THRESHOLD = "smsToMmsTextLengthThreshold"; field public static final java.lang.String MMS_CONFIG_SMS_TO_MMS_TEXT_THRESHOLD = "smsToMmsTextThreshold"; @@ -28560,7 +28561,6 @@ package android.telephony { 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 java.lang.String MMS_SHOW_CELL_BROADCAST_APP_LINKS = "config_cellBroadcastAppLinks"; field public static final int RESULT_ERROR_GENERIC_FAILURE = 1; // 0x1 field public static final int RESULT_ERROR_NO_SERVICE = 4; // 0x4 field public static final int RESULT_ERROR_NULL_PDU = 3; // 0x3 |