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

Commit 663150a7 authored by goneil's avatar goneil Committed by android-build-merger
Browse files

Merge "Require that caller holds SEND_SMS and MODIFY_PHONES_STATE permissions" am: ee48176a 

am: f220cdfc

Change-Id: Ic809d19c8d5542b8f3a7d2a8b245a4db971165e3
parents 0eff3547 f220cdfc

telephony/java/android/telephony/SmsManager.java

+5 −1
Original line number Original line Diff line number Diff line
@@ -339,6 +339,7 @@ public final class SmsManager { 
     * Send a text based SMS without writing it into the SMS Provider.

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

     *

     *

     * <p>Requires Permission:

     * <p>Requires Permission:

     * {@link android.Manifest.permission#SEND_SMS} and

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

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

     * privileges.

     * privileges.

     * </p>

     * </p>
@@ -347,7 +348,10 @@ public final class SmsManager { 
     * @hide

     * @hide

     */

     */

    @SystemApi

    @SystemApi

    @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE)

    @RequiresPermission(allOf = {

            android.Manifest.permission.MODIFY_PHONE_STATE,

            android.Manifest.permission.SEND_SMS

    })

    public void sendTextMessageWithoutPersisting(

    public void sendTextMessageWithoutPersisting(

            String destinationAddress, String scAddress, String text,

            String destinationAddress, String scAddress, String text,

            PendingIntent sentIntent, PendingIntent deliveryIntent) {

            PendingIntent sentIntent, PendingIntent deliveryIntent) {