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

Commit 0fcb56c9 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Expose SmsManager#sendTextMessageWithoutPersisting as a public API"

parents 3530bc42 dcf5c04e

api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -40417,6 +40417,7 @@ package android.telephony { 
    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 sendTextMessageWithoutPersisting(java.lang.String, java.lang.String, java.lang.String, android.app.PendingIntent, android.app.PendingIntent);

    field public static final java.lang.String EXTRA_MMS_DATA = "android.telephony.extra.MMS_DATA";

    field public static final java.lang.String EXTRA_MMS_HTTP_STATUS = "android.telephony.extra.MMS_HTTP_STATUS";

    field public static final java.lang.String MMS_CONFIG_ALIAS_ENABLED = "aliasEnabled";

api/test-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -40815,6 +40815,7 @@ package android.telephony { 
    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 sendTextMessageWithoutPersisting(java.lang.String, java.lang.String, java.lang.String, android.app.PendingIntent, android.app.PendingIntent);

    field public static final java.lang.String EXTRA_MMS_DATA = "android.telephony.extra.MMS_DATA";

    field public static final java.lang.String EXTRA_MMS_HTTP_STATUS = "android.telephony.extra.MMS_HTTP_STATUS";

    field public static final java.lang.String MMS_CONFIG_ALIAS_ENABLED = "aliasEnabled";

telephony/java/android/telephony/SmsManager.java

+5 −3
Original line number Diff line number Diff line
@@ -338,16 +338,18 @@ public final class SmsManager { 
    /**

     * Send a text based SMS without writing it into the SMS Provider.

     *

     * <p>

     * The message will be sent directly over the network and will not be visible in SMS

     * applications. Intended for internal carrier use only.

     * </p>

     *

     * <p>Requires Permission:

     * {@link android.Manifest.permission#MODIFY_PHONE_STATE} or the calling app has carrier

     * privileges.

     * </p>

     *

     * @see #sendTextMessage(String, String, String, PendingIntent, PendingIntent)

     * @hide

     */

    @SystemApi

    @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE)

    public void sendTextMessageWithoutPersisting(

            String destinationAddress, String scAddress, String text,

            PendingIntent sentIntent, PendingIntent deliveryIntent) {