diff options
| author | Robert Greenwalt <rgreenwalt@google.com> | 2012-09-24 10:16:40 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-09-24 10:16:40 -0700 |
| commit | 940eb097278ae70c721a347dc5eee8e34fdbf191 (patch) | |
| tree | 4d0c0ea014f358db774eb4c4ea9a43fff9472fcd | |
| parent | fbba193d3841b14bcfce02cdb9dd4715eb7dea39 (diff) | |
| parent | d5111f252b731396293caedbee929856acd6b276 (diff) | |
| download | frameworks_base-940eb097278ae70c721a347dc5eee8e34fdbf191.zip frameworks_base-940eb097278ae70c721a347dc5eee8e34fdbf191.tar.gz frameworks_base-940eb097278ae70c721a347dc5eee8e34fdbf191.tar.bz2 | |
am d5111f25: Merge "Fix the build." into jb-mr1-dev
* commit 'd5111f252b731396293caedbee929856acd6b276':
Fix the build.
| -rw-r--r-- | core/java/android/provider/Settings.java | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java index 7864302..f41e12c 100644 --- a/core/java/android/provider/Settings.java +++ b/core/java/android/provider/Settings.java @@ -5467,11 +5467,21 @@ public final class Settings { /** * Used to disable SMS short code confirmation - defaults to true. + * True indcates we will do the check, etc. Set to false to disable. * @see com.android.internal.telephony.SmsUsageMonitor * @hide */ public static final String SMS_SHORT_CODE_CONFIRMATION = "sms_short_code_confirmation"; + /** + * Used to select which country we use to determine premium sms codes. + * One of com.android.internal.telephony.SMSDispatcher.PREMIUM_RULE_USE_SIM, + * com.android.internal.telephony.SMSDispatcher.PREMIUM_RULE_USE_NETWORK, + * or com.android.internal.telephony.SMSDispatcher.PREMIUM_RULE_USE_BOTH. + * @hide + */ + public static final String SMS_SHORT_CODE_RULE = "sms_short_code_rule"; + /** * Prefix for SMS short code regex patterns (country code is appended). * @see com.android.internal.telephony.SmsUsageMonitor |