Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 364d73d8 authored by Sarah Chin's avatar Sarah Chin Committed by Automerger Merge Worker
Browse files

Merge "Un-deprecate SmsManager APIs" into rvc-dev am: 85e31403 am:... 

Merge "Un-deprecate SmsManager APIs" into rvc-dev am: 85e31403 am: d895f37e am: 41dc0389 am: 59b99119

Change-Id: I70ceeeab79d9d0f4e0d8ea913f3c5e4760ff3451
parents ffaa8fec 59b99119

api/current.txt

+2 −2
Original line number Diff line number Diff line
@@ -47789,7 +47789,7 @@ package android.telephony { 
    method public String createAppSpecificSmsToken(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 @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 public static android.telephony.SmsManager getDefault();

    method public static int getDefaultSmsSubscriptionId();
@@ -47799,7 +47799,7 @@ package android.telephony { 
    method public int getSubscriptionId();

    method public void injectSmsPdu(byte[], String, 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(@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);

telephony/java/android/telephony/SmsManager.java

+0 −2
Original line number Diff line number Diff line
@@ -2520,7 +2520,6 @@ public final class SmsManager { 
     * @param sentIntent if not NULL this <code>PendingIntent</code> is

     *  broadcast when the message is successfully sent, or failed

     * @throws IllegalArgumentException if contentUri is empty

     * @deprecated use {@link MmsManager#sendMultimediaMessage} instead.

     */

    public void sendMultimediaMessage(Context context, Uri contentUri, String locationUrl,

            Bundle configOverrides, PendingIntent sentIntent) {
@@ -2555,7 +2554,6 @@ public final class SmsManager { 
     * @param downloadedIntent if not NULL this <code>PendingIntent</code> is

     *  broadcast when the message is downloaded, or the download is failed

     * @throws IllegalArgumentException if locationUrl or contentUri is empty

     * @deprecated use {@link MmsManager#downloadMultimediaMessage} instead.

     */

    public void downloadMultimediaMessage(Context context, String locationUrl, Uri contentUri,

            Bundle configOverrides, PendingIntent downloadedIntent) {