diff options
| author | Ricardo Cerqueira <ricardo@cyngn.com> | 2015-09-10 21:59:57 +0100 |
|---|---|---|
| committer | Ricardo Cerqueira <ricardo@cyngn.com> | 2015-09-10 21:59:57 +0100 |
| commit | 5c3af54f1364051c1a32915242ee1b2d45fe4feb (patch) | |
| tree | c4bc13c8800503da6a181991f3302b82cfe86b2a | |
| parent | 0d7a1dddcd1baac774c0f0a478da1d7a761f0503 (diff) | |
| parent | a5c50240c5de47ed9d34c63625e541fe01a090df (diff) | |
| download | android_frameworks_opt_telephony-5c3af54f1364051c1a32915242ee1b2d45fe4feb.tar.gz android_frameworks_opt_telephony-5c3af54f1364051c1a32915242ee1b2d45fe4feb.tar.bz2 android_frameworks_opt_telephony-5c3af54f1364051c1a32915242ee1b2d45fe4feb.zip | |
Merge tag 'android-5.1.1_r18' into cm-12.1
Android 5.1.1 release 18
Change-Id: I3fe9eda62087a9d42d3f234d69c3c51ea060ddbc
| -rw-r--r-- | src/java/com/android/internal/telephony/SMSDispatcher.java | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/java/com/android/internal/telephony/SMSDispatcher.java b/src/java/com/android/internal/telephony/SMSDispatcher.java index 0eff576e4..0f135ad21 100644 --- a/src/java/com/android/internal/telephony/SMSDispatcher.java +++ b/src/java/com/android/internal/telephony/SMSDispatcher.java @@ -90,8 +90,8 @@ public abstract class SMSDispatcher extends Handler { private static final String SEND_NEXT_MSG_EXTRA = "SendNextMsg"; /** Permission required to send SMS to short codes without user confirmation. */ - private static final String SEND_SMS_NO_CONFIRMATION_PERMISSION = - "android.permission.SEND_SMS_NO_CONFIRMATION"; + private static final String SEND_RESPOND_VIA_MESSAGE_PERMISSION = + "android.permission.SEND_RESPOND_VIA_MESSAGE"; private static final int PREMIUM_RULE_USE_SIM = 1; private static final int PREMIUM_RULE_USE_NETWORK = 2; @@ -1132,7 +1132,7 @@ public abstract class SMSDispatcher extends Handler { return true; } - if (mContext.checkCallingOrSelfPermission(SEND_SMS_NO_CONFIRMATION_PERMISSION) + if (mContext.checkCallingOrSelfPermission(SEND_RESPOND_VIA_MESSAGE_PERMISSION) == PackageManager.PERMISSION_GRANTED) { return true; // app is pre-approved to send to short codes } else { |