Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Un-deprecate SmsManager APIs" am: 2827393816

Browse Source 
Change-Id: I1a9b2c4480916bb8eb5d6bb6f966a3ec8aee819c
This commit is contained in:
Sarah Chin
2020-03-31 23:14:24 +00:00
committed by Automerger Merge Worker
parent da489d05ed 2827393816
commit 02dd966131
2 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
api/current.txt
View File

@@ -45578,7 +45578,7 @@ package android.telephony {
method public String createAppSpecificSmsToken(android.app.PendingIntent); method public String createAppSpecificSmsToken(android.app.PendingIntent);
method @Nullable public String createAppSpecificSmsTokenWithPackageInfo(@Nullable String, @NonNull android.app.PendingIntent); method @Nullable public String createAppSpecificSmsTokenWithPackageInfo(@Nullable String, @NonNull android.app.PendingIntent);
method public java.util.ArrayList<java.lang.String> divideMessage(String); method public java.util.ArrayList<java.lang.String> divideMessage(String);
method @Deprecated public void downloadMultimediaMessage(android.content.Context, String, android.net.Uri, android.os.Bundle, android.app.PendingIntent); method public void downloadMultimediaMessage(android.content.Context, String, android.net.Uri, android.os.Bundle, android.app.PendingIntent);
method @NonNull public android.os.Bundle getCarrierConfigValues(); method @NonNull public android.os.Bundle getCarrierConfigValues();
method public static android.telephony.SmsManager getDefault(); method public static android.telephony.SmsManager getDefault();
method public static int getDefaultSmsSubscriptionId(); method public static int getDefaultSmsSubscriptionId();
@@ -45588,7 +45588,7 @@ package android.telephony {
method public int getSubscriptionId(); method public int getSubscriptionId();
method public void injectSmsPdu(byte[], String, android.app.PendingIntent); method public void injectSmsPdu(byte[], String, android.app.PendingIntent);
method public void sendDataMessage(String, String, short, byte[], android.app.PendingIntent, android.app.PendingIntent); method public void sendDataMessage(String, String, short, byte[], android.app.PendingIntent, android.app.PendingIntent);
method @Deprecated public void sendMultimediaMessage(android.content.Context, android.net.Uri, String, android.os.Bundle, android.app.PendingIntent); method public void sendMultimediaMessage(android.content.Context, android.net.Uri, String, android.os.Bundle, android.app.PendingIntent);
method public void sendMultipartTextMessage(String, String, java.util.ArrayList<java.lang.String>, java.util.ArrayList<android.app.PendingIntent>, java.util.ArrayList<android.app.PendingIntent>); method public void sendMultipartTextMessage(String, String, java.util.ArrayList<java.lang.String>, java.util.ArrayList<android.app.PendingIntent>, java.util.ArrayList<android.app.PendingIntent>);
method public void sendTextMessage(String, String, String, android.app.PendingIntent, android.app.PendingIntent); method public void sendTextMessage(String, String, String, android.app.PendingIntent, android.app.PendingIntent);
method @RequiresPermission(allOf={android.Manifest.permission.MODIFY_PHONE_STATE, android.Manifest.permission.SEND_SMS}) public void sendTextMessageWithoutPersisting(String, String, String, android.app.PendingIntent, android.app.PendingIntent); method @RequiresPermission(allOf={android.Manifest.permission.MODIFY_PHONE_STATE, android.Manifest.permission.SEND_SMS}) public void sendTextMessageWithoutPersisting(String, String, String, android.app.PendingIntent, android.app.PendingIntent);

2
telephony/java/android/telephony/SmsManager.java
View File

@@ -2395,7 +2395,6 @@ public final class SmsManager {
* @param sentIntent if not NULL this <code>PendingIntent</code> is * @param sentIntent if not NULL this <code>PendingIntent</code> is
* broadcast when the message is successfully sent, or failed * broadcast when the message is successfully sent, or failed
* @throws IllegalArgumentException if contentUri is empty * @throws IllegalArgumentException if contentUri is empty
* @deprecated use {@link MmsManager#sendMultimediaMessage} instead.
*/ */
public void sendMultimediaMessage(Context context, Uri contentUri, String locationUrl, public void sendMultimediaMessage(Context context, Uri contentUri, String locationUrl,
Bundle configOverrides, PendingIntent sentIntent) { Bundle configOverrides, PendingIntent sentIntent) {
@@ -2430,7 +2429,6 @@ public final class SmsManager {
* @param downloadedIntent if not NULL this <code>PendingIntent</code> is * @param downloadedIntent if not NULL this <code>PendingIntent</code> is
* broadcast when the message is downloaded, or the download is failed * broadcast when the message is downloaded, or the download is failed
* @throws IllegalArgumentException if locationUrl or contentUri is empty * @throws IllegalArgumentException if locationUrl or contentUri is empty
* @deprecated use {@link MmsManager#downloadMultimediaMessage} instead.
*/ */
public void downloadMultimediaMessage(Context context, String locationUrl, Uri contentUri, public void downloadMultimediaMessage(Context context, String locationUrl, Uri contentUri,
Bundle configOverrides, PendingIntent downloadedIntent) { Bundle configOverrides, PendingIntent downloadedIntent) {