diff options
author | fionaxu <fionaxu@google.com> | 2016-07-07 12:10:40 -0700 |
---|---|---|
committer | gitbuildkicker <android-build@google.com> | 2016-08-01 19:13:31 -0700 |
commit | b8d1aee993dcc565e6576b2f2439a8f5a507cff6 (patch) | |
tree | 9dcfb84a99a691ea6cca96833b94c880abf6cd2a | |
parent | b2c89e6f8962dc7aff88cb38aa3ee67d751edda9 (diff) | |
download | telephony-nougat-release.tar.gz |
Do not allow premium SMS during SuWandroid-cts-7.0_r9android-cts-7.0_r8android-cts-7.0_r7android-cts-7.0_r6android-cts-7.0_r5android-cts-7.0_r4android-cts-7.0_r33android-cts-7.0_r32android-cts-7.0_r31android-cts-7.0_r30android-cts-7.0_r3android-cts-7.0_r29android-cts-7.0_r28android-cts-7.0_r27android-cts-7.0_r26android-cts-7.0_r25android-cts-7.0_r24android-cts-7.0_r23android-cts-7.0_r22android-cts-7.0_r21android-cts-7.0_r20android-cts-7.0_r19android-cts-7.0_r18android-cts-7.0_r17android-cts-7.0_r16android-cts-7.0_r15android-cts-7.0_r14android-cts-7.0_r13android-cts-7.0_r12android-cts-7.0_r11android-cts-7.0_r10android-7.0.0_r9android-7.0.0_r8android-7.0.0_r7android-7.0.0_r6android-7.0.0_r5android-7.0.0_r4android-7.0.0_r3android-7.0.0_r15android-7.0.0_r13android-7.0.0_r12android-7.0.0_r11android-7.0.0_r10nougat-releasenougat-cts-release
Bug: 29420123
Change-Id: I41ef7138635f11fbe7f495dd81103458cb969c35
(cherry picked from commit 15f55ca2f204e664807e047b5f898693b274bab6)
-rw-r--r-- | src/java/com/android/internal/telephony/SMSDispatcher.java | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/java/com/android/internal/telephony/SMSDispatcher.java b/src/java/com/android/internal/telephony/SMSDispatcher.java index 963b8728ed..863f2c0bf5 100644 --- a/src/java/com/android/internal/telephony/SMSDispatcher.java +++ b/src/java/com/android/internal/telephony/SMSDispatcher.java @@ -1047,6 +1047,12 @@ public abstract class SMSDispatcher extends Handler { return true; // not a premium short code } + // Do not allow any premium sms during SuW + if (Settings.Global.getInt(mResolver, Settings.Global.DEVICE_PROVISIONED, 0) == 0) { + Rlog.e(TAG, "Can't send premium sms during Setup Wizard"); + return false; + } + // Wait for user confirmation unless the user has set permission to always allow/deny int premiumSmsPermission = mUsageMonitor.getPremiumSmsPermission( tracker.mAppInfo.packageName); |