diff options
author | emancebo <emancebo@cyngn.com> | 2015-04-28 16:13:06 -0700 |
---|---|---|
committer | Ed Mancebo <emancebo@cyngn.com> | 2015-04-29 01:24:29 +0000 |
commit | 1cddbc0f0ee83c4518b4696c971613be5444557a (patch) | |
tree | 4d3a3d087f5e9534006455d3db7390bf1cc4b05d | |
parent | 3e0ad98e8ed3db92ab5b5f855731d2079ceaae34 (diff) | |
download | android_frameworks_opt_telephony-stable/cm-12.0-YNG3C.tar.gz android_frameworks_opt_telephony-stable/cm-12.0-YNG3C.tar.bz2 android_frameworks_opt_telephony-stable/cm-12.0-YNG3C.zip |
Telephony: fallback to xml resources for sms shortcode recognitionstable/cm-12.0-YNG3C
Change-Id: Ie0cef484ed6e84593333e75b35abb5eb87793af7
-rw-r--r-- | src/java/com/android/internal/telephony/SmsUsageMonitor.java | 7 |
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); } |