summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVojtech Bocek <vbocek@gmail.com>2014-07-03 15:22:41 +0200
committerGerrit Code Review <gerrit2@gerrit>2014-07-09 15:57:59 +0200
commit67351dca6670d3566405cb8e610f73a1550d282b (patch)
tree5e2cb4066451c92adbbee25fb880248d5d4cd05c
parentChange ro.twrp.boot boolean to twrp.crash_counter (diff)
downloadandroid_bootable_recovery-67351dca6670d3566405cb8e610f73a1550d282b.tar
android_bootable_recovery-67351dca6670d3566405cb8e610f73a1550d282b.tar.gz
android_bootable_recovery-67351dca6670d3566405cb8e610f73a1550d282b.tar.bz2
android_bootable_recovery-67351dca6670d3566405cb8e610f73a1550d282b.tar.lz
android_bootable_recovery-67351dca6670d3566405cb8e610f73a1550d282b.tar.xz
android_bootable_recovery-67351dca6670d3566405cb8e610f73a1550d282b.tar.zst
android_bootable_recovery-67351dca6670d3566405cb8e610f73a1550d282b.zip
Diffstat (limited to '')
-rw-r--r--twrp-functions.cpp10
-rw-r--r--twrp.cpp3
2 files changed, 2 insertions, 11 deletions
diff --git a/twrp-functions.cpp b/twrp-functions.cpp
index db98a363a..4306c4520 100644
--- a/twrp-functions.cpp
+++ b/twrp-functions.cpp
@@ -1094,16 +1094,6 @@ void TWFunc::Fixup_Time_On_Boot()
struct dirent *dt;
std::string ats_path;
-
- // Don't fix the time of it already is over year 2000, it is likely already okay, either
- // because the RTC is fine or because the recovery already set it and then crashed
- gettimeofday(&tv, NULL);
- if(tv.tv_sec > 946684800) // timestamp of 2000-01-01 00:00:00
- {
- LOGINFO("TWFunc::Fixup_Time: not fixing time, it seems to be already okay (after year 2000).\n");
- return;
- }
-
if(!PartitionManager.Mount_By_Path("/data", false))
return;
diff --git a/twrp.cpp b/twrp.cpp
index b67631ea8..3e0fc9b9a 100644
--- a/twrp.cpp
+++ b/twrp.cpp
@@ -273,7 +273,8 @@ int main(int argc, char **argv) {
DataManager::ReadSettingsFile();
// Fixup the RTC clock on devices which require it
- TWFunc::Fixup_Time_On_Boot();
+ if(crash_counter == 0)
+ TWFunc::Fixup_Time_On_Boot();
// Run any outstanding OpenRecoveryScript
if (DataManager::GetIntValue(TW_IS_ENCRYPTED) == 0 && (TWFunc::Path_Exists(SCRIPT_FILE_TMP) || TWFunc::Path_Exists(SCRIPT_FILE_CACHE))) {