drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge \"Don\'t show times before 2000-01-01\" into nyc-mr1-dev

Browse Source 
am: 4786f6d958

Change-Id: Ic0eb9edf0cc94f62d808e214e19c8003dc9a7941
This commit is contained in:
Damien Bargiacchi
2016-07-13 00:51:43 +00:00
committed by android-build-merger
parent ee448e78af 4786f6d958
commit c1c895b573
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
cmds/bootanimation/BootAnimation.cpp
View File

@ -72,6 +72,8 @@ static const char LAST_TIME_CHANGED_FILE_NAME[] = "last_time_change";
static const char LAST_TIME_CHANGED_FILE_PATH[] = "/data/system/time/last_time_change";
static const char ACCURATE_TIME_FLAG_FILE_NAME[] = "time_is_accurate";
static const char ACCURATE_TIME_FLAG_FILE_PATH[] = "/data/system/time/time_is_accurate";
// Java timestamp format. Don't show the clock if the date is before 2000-01-01 00:00:00.
static const long long ACCURATE_TIME_EPOCH = 946684800000;
static const char EXIT_PROP_NAME[] = "service.bootanim.exit";
static const int ANIM_ENTRY_NAME_MAX = 256;
@ -932,8 +934,9 @@ bool BootAnimation::updateIsTimeAccurate() {
clock_gettime(CLOCK_REALTIME, &now);
// Match the Java timestamp format
long long rtcNow = (now.tv_sec * 1000LL) + (now.tv_nsec / 1000000LL);
if (lastChangedTime > rtcNow - MAX_TIME_IN_PAST
&& lastChangedTime < rtcNow + MAX_TIME_IN_FUTURE) {
if (ACCURATE_TIME_EPOCH < rtcNow
&& lastChangedTime > (rtcNow - MAX_TIME_IN_PAST)
&& lastChangedTime < (rtcNow + MAX_TIME_IN_FUTURE)) {
mTimeIsAccurate = true;
}
}