commit b8d1aee993dcc565e6576b2f2439a8f5a507cff6
author fionaxu <fionaxu@google.com> Thu Jul 07 12:10:40 2016 -0700
committer gitbuildkicker <android-build@google.com> Mon Aug 01 19:13:31 2016 -0700
tree 9dcfb84a99a691ea6cca96833b94c880abf6cd2a
parent b2c89e6f8962dc7aff88cb38aa3ee67d751edda9

Do not allow premium SMS during SuW

Bug: 29420123
Change-Id: I41ef7138635f11fbe7f495dd81103458cb969c35
(cherry picked from commit 15f55ca2f204e664807e047b5f898693b274bab6)

src/java/com/android/internal/telephony/SMSDispatcher.java

diff --git a/src/java/com/android/internal/telephony/SMSDispatcher.java b/src/java/com/android/internal/telephony/SMSDispatcher.java
index 963b872..863f2c0 100644
--- a/src/java/com/android/internal/telephony/SMSDispatcher.java
+++ b/src/java/com/android/internal/telephony/SMSDispatcher.java
@@ -1047,6 +1047,12 @@
                 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);