drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 6bb7a4a6: Go one day into 1970 for timezone code.

Browse Source 
Merge commit '6bb7a4a68ae79dab56b23d1c7111bf7eb3aa55fe' into gingerbread-plus-aosp

* commit '6bb7a4a68ae79dab56b23d1c7111bf7eb3aa55fe':
  Go one day into 1970 for timezone code.
This commit is contained in:
Brad Fitzpatrick
2010-10-11 13:49:12 -07:00
committed by Android Git Automerger
parent 14d151bf41 6bb7a4a68a
commit 2af4c51e9a
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
services/java/com/android/server/SystemServer.java
View File

@ -578,6 +578,10 @@ public class SystemServer
static Timer timer; static Timer timer;
static final long SNAPSHOT_INTERVAL = 60 * 60 * 1000; // 1hr static final long SNAPSHOT_INTERVAL = 60 * 60 * 1000; // 1hr
// The earliest supported time. We pick one day into 1970, to
// give any timezone code room without going into negative time.
private static final long EARLIEST_SUPPORTED_TIME = 86400 * 1000;
/** /**
* This method is called from Zygote to initialize the system. This will cause the native * This method is called from Zygote to initialize the system. This will cause the native
* services (SurfaceFlinger, AudioFlinger, etc..) to be started. After that it will call back * services (SurfaceFlinger, AudioFlinger, etc..) to be started. After that it will call back
@ -586,14 +590,14 @@ public class SystemServer
native public static void init1(String[] args); native public static void init1(String[] args);
public static void main(String[] args) { public static void main(String[] args) {
if (System.currentTimeMillis() < 0) { if (System.currentTimeMillis() < EARLIEST_SUPPORTED_TIME) {
// If a device's clock is before 1970 (before 0), a lot of // If a device's clock is before 1970 (before 0), a lot of
// APIs crash dealing with negative numbers, notably // APIs crash dealing with negative numbers, notably
// java.io.File#setLastModified, so instead we fake it and // java.io.File#setLastModified, so instead we fake it and
// hope that time from cell towers or NTP fixes it // hope that time from cell towers or NTP fixes it
// shortly. // shortly.
Slog.w(TAG, "System clock is before 1970; setting to 1970."); Slog.w(TAG, "System clock is before 1970; setting to 1970.");
SystemClock.setCurrentTimeMillis(1); // 0 isn't allowed SystemClock.setCurrentTimeMillis(EARLIEST_SUPPORTED_TIME);
} }
if (SamplingProfilerIntegration.isEnabled()) { if (SamplingProfilerIntegration.isEnabled()) {