|
|
@ -1191,11 +1191,12 @@ bool CPhoneDevice::Reboot(int resetType, bool manually, const std::string& reaso
|
|
|
|
time_t ts = time(NULL);
|
|
|
|
time_t ts = time(NULL);
|
|
|
|
if ((ts - rebootTime) < 1800)
|
|
|
|
if ((ts - rebootTime) < 1800)
|
|
|
|
{
|
|
|
|
{
|
|
|
|
XYLOG(XYLOG_SEVERITY_WARNING, "Frequent REBOOT DEV Cancelled Prev RBT Time=%lld", (int64_t)rebootTime);
|
|
|
|
XYLOG(XYLOG_SEVERITY_INFO, "Frequent REBOOT DEV Cancelled Prev RBT Time=%lld", (int64_t)rebootTime);
|
|
|
|
return false;
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if (manually)
|
|
|
|
XYLOG(XYLOG_SEVERITY_WARNING_EX, "REBOOT DEV manually=%d After %ums Reason:%s", manually ? 1 : 0, timeout, reason.c_str());
|
|
|
|
|
|
|
|
// if (manually)
|
|
|
|
{
|
|
|
|
{
|
|
|
|
#ifdef USING_N938
|
|
|
|
#ifdef USING_N938
|
|
|
|
|
|
|
|
|
|
|
@ -1215,8 +1216,7 @@ bool CPhoneDevice::Reboot(int resetType, bool manually, const std::string& reaso
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else
|
|
|
|
else
|
|
|
|
{
|
|
|
|
{
|
|
|
|
long timeout = 1000;
|
|
|
|
RestartApp(resetType, (long)timeout, reason);
|
|
|
|
RestartApp(resetType, timeout, reason);
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
return true;
|
|
|
|
return true;
|
|
|
|