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

Merge "Remove dead code from SystemServer"

Browse Source
This commit is contained in:
Neil Fuller
2019-11-25 13:53:15 +00:00
committed by Gerrit Code Review
parent ed2a3ec9b4 4b03c07cc7
commit 05eeef4188
2 changed files with 1 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
core/java/android/os/SystemClock.java
View File

@@ -154,6 +154,7 @@ public final class SystemClock {
final IAlarmManager mgr = IAlarmManager.Stub final IAlarmManager mgr = IAlarmManager.Stub
.asInterface(ServiceManager.getService(Context.ALARM_SERVICE)); .asInterface(ServiceManager.getService(Context.ALARM_SERVICE));
if (mgr == null) { if (mgr == null) {
Slog.e(TAG, "Unable to set RTC: mgr == null");
return false; return false;
} }

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

@@ -384,15 +384,6 @@ public final class SystemServer {
EventLog.writeEvent(EventLogTags.SYSTEM_SERVER_START, EventLog.writeEvent(EventLogTags.SYSTEM_SERVER_START,
mStartCount, mRuntimeStartUptime, mRuntimeStartElapsedTime); 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. // Default the timezone property to GMT if not set.
// //