diff options
| author | Steve Kondik <steve@cyngn.com> | 2015-11-16 15:01:23 -0800 |
|---|---|---|
| committer | Steve Kondik <steve@cyngn.com> | 2015-11-16 15:01:23 -0800 |
| commit | 3ada4b5a85fa907989855065179c4661653cd9ad (patch) | |
| tree | 6f461e770d8a22dfc0d26c8917086df4c31d5905 /packages/SettingsProvider/res/values | |
| parent | 5ceb8731615dbbd54e027e09e46e724037e3a809 (diff) | |
| parent | 5ccaaff4818af8d48e072cbd2b8b784e5cd0c593 (diff) | |
| download | frameworks_base-3ada4b5a85fa907989855065179c4661653cd9ad.zip frameworks_base-3ada4b5a85fa907989855065179c4661653cd9ad.tar.gz frameworks_base-3ada4b5a85fa907989855065179c4661653cd9ad.tar.bz2 | |
Merge branch 'LA.BF64.1.2.2_rb4.7' of git://codeaurora.org/platform/frameworks/base into cm-13.0
Change-Id: I008f052e4e27b44457c8343d20f6e1ba943c8e1f
Diffstat (limited to 'packages/SettingsProvider/res/values')
| -rw-r--r-- | packages/SettingsProvider/res/values/defaults.xml | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/packages/SettingsProvider/res/values/defaults.xml b/packages/SettingsProvider/res/values/defaults.xml index 4ffa3ad..d841573 100644 --- a/packages/SettingsProvider/res/values/defaults.xml +++ b/packages/SettingsProvider/res/values/defaults.xml @@ -228,4 +228,7 @@ <!-- Default protected sms originating address values of Settings.Secure.PROTECTED_SMS_ADDRESSES --> <string-array name="def_protected_sms_list_values"></string-array> + + <!-- Default for Settings.Global.CAPTIVE_PORTAL_DETECTION_ENABLED --> + <integer name="def_captive_portal_detection_enabled" translatable="false">1</integer> </resources> |