diff options
| author | Neil Fuller <nfuller@google.com> | 2019-11-25 06:28:07 -0800 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-11-25 06:28:07 -0800 |
| commit | 18e458ef009118d5ce4da7b73c0a8d6c20b54dc5 (patch) | |
| tree | 3ad90669e5854278d3f618b2bafc217034d5a2e8 /services/java/com/android | |
| parent | a2718c95fbf6cec67c4d17170157ceeb5125c81e (diff) | |
| parent | 01d1dd28f1646dd19b65ec2c145615fafaea366a (diff) | |
Merge "Remove dead code from SystemServer" am: 05eeef4188
am: 01d1dd28f1
Change-Id: Ifa10a6e2b48f596bfa6854e1a950cec060253c76
Diffstat (limited to 'services/java/com/android')
| -rw-r--r-- | services/java/com/android/server/SystemServer.java | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/services/java/com/android/server/SystemServer.java b/services/java/com/android/server/SystemServer.java index eb5d035739a4..1c6496026e39 100644 --- a/services/java/com/android/server/SystemServer.java +++ b/services/java/com/android/server/SystemServer.java @@ -386,15 +386,6 @@ public final class SystemServer { EventLog.writeEvent(EventLogTags.SYSTEM_SERVER_START, mStartCount, mRuntimeStartUptime, mRuntimeStartElapsedTime); - // 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. - if (System.currentTimeMillis() < EARLIEST_SUPPORTED_TIME) { - Slog.w(TAG, "System clock is before 1970; setting to 1970."); - SystemClock.setCurrentTimeMillis(EARLIEST_SUPPORTED_TIME); - } - // // Default the timezone property to GMT if not set. // |