am f96965ae: am dbcb4e10: am 7d1d4af3: am a42e6816: Merge "Change NTP polling interval from 10 days to 24 hours." into mnc-dev

* commit 'f96965aec2f2e031bdaca0c55dbda89e9e522ed8':
  Change NTP polling interval from 10 days to 24 hours.
This commit is contained in:
Christine Hallstrom
2015-07-29 19:24:02 +00:00
committed by Android Git Automerger

View File

@@ -1475,7 +1475,7 @@
<!-- Remote server that can provide NTP responses. --> <!-- Remote server that can provide NTP responses. -->
<string translatable="false" name="config_ntpServer">2.android.pool.ntp.org</string> <string translatable="false" name="config_ntpServer">2.android.pool.ntp.org</string>
<!-- Normal polling frequency in milliseconds --> <!-- Normal polling frequency in milliseconds -->
<integer name="config_ntpPollingInterval">864000000</integer> <integer name="config_ntpPollingInterval">86400000</integer>
<!-- Try-again polling interval in milliseconds, in case the network request failed --> <!-- Try-again polling interval in milliseconds, in case the network request failed -->
<integer name="config_ntpPollingIntervalShorter">60000</integer> <integer name="config_ntpPollingIntervalShorter">60000</integer>
<!-- Number of times to try again with the shorter interval, before backing <!-- Number of times to try again with the shorter interval, before backing