Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am d5111f25: Merge "Fix the build." into jb-mr1-dev

Browse Source 
* commit 'd5111f252b731396293caedbee929856acd6b276':
  Fix the build.
This commit is contained in:
Robert Greenwalt
2012-09-24 10:16:40 -07:00
committed by Android Git Automerger
parent fbba193d38 d5111f252b
commit 940eb09727
1 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
core/java/android/provider/Settings.java
View File

@@ -5467,11 +5467,21 @@ public final class Settings {
/** /**
* Used to disable SMS short code confirmation - defaults to true. * 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 * @see com.android.internal.telephony.SmsUsageMonitor
* @hide * @hide
*/ */
public static final String SMS_SHORT_CODE_CONFIRMATION = "sms_short_code_confirmation"; 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). * Prefix for SMS short code regex patterns (country code is appended).
* @see com.android.internal.telephony.SmsUsageMonitor * @see com.android.internal.telephony.SmsUsageMonitor