Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 18e458ef authored by Neil Fuller's avatar Neil Fuller Committed by android-build-merger
Browse files

Merge "Remove dead code from SystemServer" am: 05eeef41 

am: 01d1dd28

Change-Id: Ifa10a6e2b48f596bfa6854e1a950cec060253c76
parents a2718c95 01d1dd28

core/java/android/os/SystemClock.java

+1 −0
Original line number Diff line number Diff line
@@ -154,6 +154,7 @@ public final class SystemClock { 
        final IAlarmManager mgr = IAlarmManager.Stub

                .asInterface(ServiceManager.getService(Context.ALARM_SERVICE));

        if (mgr == null) {

            Slog.e(TAG, "Unable to set RTC: mgr == null");

            return false;

        }

services/java/com/android/server/SystemServer.java

+0 −9
Original line number Diff line number Diff line
@@ -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.

            //