aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/java/com/android/internal/telephony/SmsUsageMonitor.java7
1 files changed, 5 insertions, 2 deletions
diff --git a/src/java/com/android/internal/telephony/SmsUsageMonitor.java b/src/java/com/android/internal/telephony/SmsUsageMonitor.java
index 03057afe2..6a00ba579 100644
--- a/src/java/com/android/internal/telephony/SmsUsageMonitor.java
+++ b/src/java/com/android/internal/telephony/SmsUsageMonitor.java
@@ -64,7 +64,7 @@ import java.util.regex.Pattern;
*/
public class SmsUsageMonitor {
private static final String TAG = "SmsUsageMonitor";
- private static final boolean DBG = false;
+ private static final boolean DBG = true; // intentionally enable DBG
private static final boolean VDBG = false;
private static final String SHORT_CODE_PATH = "/data/misc/sms/codes";
@@ -447,7 +447,10 @@ public class SmsUsageMonitor {
if (mPatternFile.exists()) {
if (DBG) Rlog.d(TAG, "Loading SMS Short Code patterns from file");
mCurrentPatternMatcher = getPatternMatcherFromFile(countryIso);
- } else {
+ }
+
+ // if matcher not defined in file, fall back to xml
+ if (mCurrentPatternMatcher == null) {
if (DBG) Rlog.d(TAG, "Loading SMS Short Code patterns from resource");
mCurrentPatternMatcher = getPatternMatcherFromResource(countryIso);
}