diff options
| author | fionaxu <fionaxu@google.com> | 2016-07-07 12:10:40 -0700 |
|---|---|---|
| committer | gitbuildkicker <android-build@google.com> | 2016-07-21 17:14:14 -0700 |
| commit | bc41a81b83f2ebbfa650f3f81232e6da7bc04a3a (patch) | |
| tree | d8a2acd5fe3c15813548e0bb910e5ea5e67ab937 | |
| parent | 39f75c32b261b7dcae09c194b35fa67c72f99dca (diff) | |
| download | telephony-marshmallow-dr1.6-release.tar.gz | |
Do not allow premium SMS during SuWandroid-6.0.1_r68android-6.0.1_r67marshmallow-dr1.6-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 2187e84e1b..0489596242 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); |