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

am ce2f1909: Merge "On boot, advance time to at least 1970." into gingerbread

Browse Source 
Merge commit 'ce2f1909c74a1b90995f06a865d21260b062300b' into gingerbread-plus-aosp

* commit 'ce2f1909c74a1b90995f06a865d21260b062300b':
  On boot, advance time to at least 1970.
This commit is contained in:
Brad Fitzpatrick
2010-10-11 13:03:15 -07:00
committed by Android Git Automerger
parent 8b8a8f65b5 ce2f1909c7
commit 14d151bf41
1 changed files with 16 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -35,7 +35,12 @@ import android.content.pm.IPackageManager;
import android.database.ContentObserver;
import android.database.Cursor;
import android.media.AudioService;
import android.os.*;
import android.os.Looper;
import android.os.RemoteException;
import android.os.ServiceManager;
import android.os.StrictMode;
import android.os.SystemClock;
import android.os.SystemProperties;
import android.provider.Contacts.People;
import android.provider.Settings;
import android.server.BluetoothA2dpService;
@@ -581,6 +586,16 @@ public class SystemServer
native public static void init1(String[] args);
public static void main(String[] args) {
if (System.currentTimeMillis() < 0) {
// If a device's clock is before 1970 (before 0), a lot of
// APIs crash dealing with negative numbers, notably
// java.io.File#setLastModified, so instead we fake it and
// hope that time from cell towers or NTP fixes it
// shortly.
Slog.w(TAG, "System clock is before 1970; setting to 1970.");
SystemClock.setCurrentTimeMillis(1); // 0 isn't allowed
}
if (SamplingProfilerIntegration.isEnabled()) {
SamplingProfilerIntegration.start();
timer = new Timer();