diff options
| author | Jake Hamby <jhamby@google.com> | 2012-05-09 15:17:16 -0700 |
|---|---|---|
| committer | Jake Hamby <jhamby@google.com> | 2012-05-09 15:17:16 -0700 |
| commit | 6de4da44618c970e32c84c28a37e38156388107e (patch) | |
| tree | f094647c0409345472baf4022f136a109e82cad5 /telephony | |
| parent | 01028b6fa4d56808f3cced408d9d55ae1a710fa8 (diff) | |
| download | frameworks_base-6de4da44618c970e32c84c28a37e38156388107e.zip frameworks_base-6de4da44618c970e32c84c28a37e38156388107e.tar.gz frameworks_base-6de4da44618c970e32c84c28a37e38156388107e.tar.bz2 | |
Change SMS security check to enforceCallingPermission().
The permission check for IccSmsInterfaceManager.sendText() was changed from
enforceCallingPermission() to enforceCallingOrSelfPermission() to enable the
Phone app to send SMS's directly for the "reply by SMS" feature. That feature
was implemented in a different way (handled by the MMS app), so the permission
check can be changed back to the original enforceCallingPermission(). Verified
that SMS can still be sent, including "reply by SMS" for an incoming call.
Bug: 4686733
Change-Id: If844a0c485de0a87857d8f82a3452e776005153e
Diffstat (limited to 'telephony')
| -rw-r--r-- | telephony/java/com/android/internal/telephony/IccSmsInterfaceManager.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/telephony/java/com/android/internal/telephony/IccSmsInterfaceManager.java b/telephony/java/com/android/internal/telephony/IccSmsInterfaceManager.java index 9763265..5fef6de 100644 --- a/telephony/java/com/android/internal/telephony/IccSmsInterfaceManager.java +++ b/telephony/java/com/android/internal/telephony/IccSmsInterfaceManager.java @@ -112,7 +112,7 @@ public abstract class IccSmsInterfaceManager extends ISms.Stub { */ public void sendText(String destAddr, String scAddr, String text, PendingIntent sentIntent, PendingIntent deliveryIntent) { - mPhone.getContext().enforceCallingOrSelfPermission( + mPhone.getContext().enforceCallingPermission( "android.permission.SEND_SMS", "Sending SMS message"); if (Log.isLoggable("SMS", Log.VERBOSE)) { |