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

Unverified Commit 8174c3f7 authored by Kevin F. Haggerty's avatar Kevin F. Haggerty
Browse files

Merge tag 'android-9.0.0_r35' into staging/lineage-16.0_merge-android-9.0.0_r35 

Android 9.0.0 release 35

* tag 'android-9.0.0_r35':
  Be more comprehensive about boot time RTC check

Change-Id: Ieaf38ff2a62fe96b5c8cc20919d000c95b4556ff
parents 3da54b5c 1b1681a8

services/core/java/com/android/server/AlarmManagerService.java

+7 −2
Original line number Diff line number Diff line
@@ -48,6 +48,7 @@ import android.content.pm.PermissionInfo; 
import android.database.ContentObserver;

import android.net.Uri;

import android.os.Binder;

import android.os.Build;

import android.os.Bundle;

import android.os.Environment;

import android.os.Handler;
@@ -1288,9 +1289,13 @@ class AlarmManagerService extends SystemService { 
        // because kernel doesn't keep this after reboot

        setTimeZoneImpl(SystemProperties.get(TIMEZONE_PROPERTY));



        // Also sure that we're booting with a halfway sensible current time

        if (mNativeData != 0) {

            final long systemBuildTime = Environment.getRootDirectory().lastModified();

            // Ensure that we're booting with a halfway sensible current time.  Use the

            // most recent of Build.TIME, the root file system's timestamp, and the

            // value of the ro.build.date.utc system property (which is in seconds).

            final long systemBuildTime =  Long.max(

                    1000L * SystemProperties.getLong("ro.build.date.utc", -1L),

                    Long.max(Environment.getRootDirectory().lastModified(), Build.TIME));

            if (System.currentTimeMillis() < systemBuildTime) {

                Slog.i(TAG, "Current time only " + System.currentTimeMillis()

                        + ", advancing to build time " + systemBuildTime);