commit d9963672a44e5bb3e3664530a3faafca8b30a5f2
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Feb 20 16:27:06 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Feb 20 16:27:06 2020 +0000
tree 2573f977cbd8d8525a3c56c5aee4c08d83ad45a2
parent 62e749ca2a1c39d13ca3140d2b889fe9c40faf2f
parent be6d7486f55e7710a5a29516c44a2c2d3e8ea88e

Merge "Match timestamp units with the interface definitions" into qt-qpr1-dev am: f1f3961cda am: be6d7486f5

Change-Id: I29bc372246f77054e85a717e0eae1fedfd009565

service/src/com/android/car/hal/PowerHalService.java

diff --git a/service/src/com/android/car/hal/PowerHalService.java b/service/src/com/android/car/hal/PowerHalService.java
index cc71d25..518931a 100644
--- a/service/src/com/android/car/hal/PowerHalService.java
+++ b/service/src/com/android/car/hal/PowerHalService.java
@@ -213,7 +213,7 @@
      */
     public void sendSleepEntry(int wakeupTimeSec) {
         Log.i(CarLog.TAG_POWER, "send sleep entry");
-        setPowerState(VehicleApPowerStateReport.DEEP_SLEEP_ENTRY, wakeupTimeSec * 1000);
+        setPowerState(VehicleApPowerStateReport.DEEP_SLEEP_ENTRY, wakeupTimeSec);
     }
 
     /**
@@ -238,7 +238,7 @@
      */
     public void sendShutdownStart(int wakeupTimeSec) {
         Log.i(CarLog.TAG_POWER, "send shutdown start");
-        setPowerState(VehicleApPowerStateReport.SHUTDOWN_START, wakeupTimeSec * 1000);
+        setPowerState(VehicleApPowerStateReport.SHUTDOWN_START, wakeupTimeSec);
     }
 
     /**