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

Un-deprecate SmsManager APIs

Browse Source 
MmsManager methods were removed for mainline, so unexposing these

Test: build
Bug: 144004293
Change-Id: I9714719f2d922cb027fa42a1aa535006dce7342c
This commit is contained in:
Sarah Chin
2020-03-25 23:33:04 -07:00
parent 7b1e562c62
commit ac3eb46325
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

@@ -47779,7 +47779,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();
@@ -47789,7 +47789,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 sendMultipartTextMessage(@NonNull String, @Nullable String, @NonNull java.util.List<java.lang.String>, @Nullable java.util.List<android.app.PendingIntent>, @Nullable java.util.List<android.app.PendingIntent>, long); method public void sendMultipartTextMessage(@NonNull String, @Nullable String, @NonNull java.util.List<java.lang.String>, @Nullable java.util.List<android.app.PendingIntent>, @Nullable java.util.List<android.app.PendingIntent>, long);
method public void sendMultipartTextMessage(@NonNull String, @Nullable String, @NonNull java.util.List<java.lang.String>, @Nullable java.util.List<android.app.PendingIntent>, @Nullable java.util.List<android.app.PendingIntent>, @NonNull String, @Nullable String); method public void sendMultipartTextMessage(@NonNull String, @Nullable String, @NonNull java.util.List<java.lang.String>, @Nullable java.util.List<android.app.PendingIntent>, @Nullable java.util.List<android.app.PendingIntent>, @NonNull String, @Nullable String);

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

@@ -2520,7 +2520,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) {
@@ -2555,7 +2554,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) {