diff options
| author | Alex Vakulenko <avakulenko@google.com> | 2016-01-20 07:55:13 -0800 |
|---|---|---|
| committer | Alex Vakulenko <avakulenko@google.com> | 2016-01-20 07:55:13 -0800 |
| commit | b59838fa1f7ec24a0d1e632026ce94a7329afb63 (patch) | |
| tree | 15d403bca541d4bf6a43374f7752f16592039416 /daemon | |
| parent | ad7b9fd43790df4293600bc6c6034961f3896b5b (diff) | |
| download | nativepower-b59838fa1f7ec24a0d1e632026ce94a7329afb63.tar.gz | |
nativepower: Update libchrome APIs to r369476
The new libchrome has been ported from Chromium and some APIs have
changed. Make necessary changes at call sites.
Change-Id: Ic3bb6e56835da9f1f2e12c582ee6fc5167691c29
Diffstat (limited to 'daemon')
| -rw-r--r-- | daemon/power_manager.cc | 3 | ||||
| -rw-r--r-- | daemon/power_manager_unittest.cc | 6 |
2 files changed, 5 insertions, 4 deletions
diff --git a/daemon/power_manager.cc b/daemon/power_manager.cc index 0498965..2f961b7 100644 --- a/daemon/power_manager.cc +++ b/daemon/power_manager.cc @@ -117,8 +117,7 @@ status_t PowerManager::goToSleep(int64_t event_time_ms, int reason, int flags) { return UNKNOWN_ERROR; } - last_resume_uptime_ = - base::TimeDelta::FromMilliseconds(base::SysInfo::Uptime()); + last_resume_uptime_ = base::SysInfo::Uptime(); LOG(INFO) << "Resumed from suspend at " << last_resume_uptime_.InMilliseconds(); return OK; diff --git a/daemon/power_manager_unittest.cc b/daemon/power_manager_unittest.cc index a81f935..c221ace 100644 --- a/daemon/power_manager_unittest.cc +++ b/daemon/power_manager_unittest.cc @@ -120,7 +120,7 @@ TEST_F(PowerManagerTest, AcquireAndReleaseWakeLock) { TEST_F(PowerManagerTest, GoToSleep) { EXPECT_EQ("", ReadPowerState()); - const int kStartTime = base::SysInfo::Uptime(); + const int64_t kStartTime = base::SysInfo::Uptime().InMilliseconds(); EXPECT_EQ(OK, interface_->goToSleep(kStartTime, 0 /* reason */, 0 /* flags */)); EXPECT_EQ(PowerManager::kPowerStateSuspend, ReadPowerState()); @@ -133,7 +133,9 @@ TEST_F(PowerManagerTest, GoToSleep) { // A second attempt with a timestamp occurring after the last // resume should be honored. ClearPowerState(); - EXPECT_EQ(OK, interface_->goToSleep(base::SysInfo::Uptime(), 0, 0)); + EXPECT_EQ( + OK, + interface_->goToSleep(base::SysInfo::Uptime().InMilliseconds(), 0, 0)); EXPECT_EQ(PowerManager::kPowerStateSuspend, ReadPowerState()); } |