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

am 126fee88: am db9f06d9: resolved conflicts for merge of 2a1e9641 to eclair-mr2

Browse Source 
Merge commit '126fee88d480939d46b8ddd1e3a03cdd193fa040'

* commit '126fee88d480939d46b8ddd1e3a03cdd193fa040':
  Add code to use Gservices provided values for throtting NITZ updates.
This commit is contained in:
Wink Saville
2009-11-12 23:13:17 -08:00
committed by Android Git Automerger
parent 5b65ef4c95 126fee88d4
commit b74ebcabe0
2 changed files with 25 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3710,6 +3710,19 @@ public final class Settings {
public static final String DROPBOX_TAG_PREFIX =
"dropbox:";
/**
* The length of time in milli-seconds that automatic small adjustments to
* SystemClock are ignored if NITZ_UPDATE_DIFF is not exceeded.
*/
public static final String NITZ_UPDATE_SPACING = "nitz_update_spacing";
/**
* If the NITZ_UPDATE_DIFF time is exceeded then an automatic adjustment
* to SystemClock will be allowed even if NITZ_UPDATE_SPACING has not been
* exceeded.
*/
public static final String NITZ_UPDATE_DIFF = "nitz_update_diff";
/**
* @deprecated
* @hide