commit ee48176ad6bb61abf4a2eb1024be2a1ee555c8a8
author Treehugger Robot <treehugger-gerrit@google.com> Wed Dec 27 21:22:02 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Dec 27 21:22:02 2017 +0000
tree 81977c75e8b823068264758101362bcf057c32a6
parent 10d1ee58f8eeee4df06604f9490834c5406d71d1
parent d75e242fb82ffdcdd0ee001671619faf743e8705

Merge "Require that caller holds  SEND_SMS and  MODIFY_PHONES_STATE permissions"

telephony/java/android/telephony/SmsManager.java

diff --git a/telephony/java/android/telephony/SmsManager.java b/telephony/java/android/telephony/SmsManager.java
index 62b0f9b..78a4c65 100644
--- a/telephony/java/android/telephony/SmsManager.java
+++ b/telephony/java/android/telephony/SmsManager.java
@@ -339,6 +339,7 @@
      * Send a text based SMS without writing it into the SMS Provider.
      *
      * <p>Requires Permission:
+     * {@link android.Manifest.permission#SEND_SMS} and
      * {@link android.Manifest.permission#MODIFY_PHONE_STATE} or the calling app has carrier
      * privileges.
      * </p>
@@ -347,7 +348,10 @@
      * @hide
      */
     @SystemApi
-    @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE)
+    @RequiresPermission(allOf = {
+            android.Manifest.permission.MODIFY_PHONE_STATE,
+            android.Manifest.permission.SEND_SMS
+    })
     public void sendTextMessageWithoutPersisting(
             String destinationAddress, String scAddress, String text,
             PendingIntent sentIntent, PendingIntent deliveryIntent) {