diff options
| author | android-build-team Robot <android-build-team-robot@google.com> | 2018-08-02 03:14:56 +0000 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2018-08-02 03:14:56 +0000 |
| commit | 207b549d4b3289cd991b17ac3e2bff814f497c3a (patch) | |
| tree | d69cbdf00526161c8960b667d3c4a12648e1696a | |
| parent | 13c03860a87785af1fd3980212f5fbe7927ee58c (diff) | |
| parent | 543816812430b72b898371c2e345438d0a08a7a7 (diff) | |
| download | android_device_generic_goldfish-207b549d4b3289cd991b17ac3e2bff814f497c3a.tar.gz android_device_generic_goldfish-207b549d4b3289cd991b17ac3e2bff814f497c3a.tar.bz2 android_device_generic_goldfish-207b549d4b3289cd991b17ac3e2bff814f497c3a.zip | |
Snap for 4927333 from 543816812430b72b898371c2e345438d0a08a7a7 to pi-qpr1-release
Change-Id: I4af83a411653d73fb70a50acdb52ea3d0cb3800e
| -rwxr-xr-x | init.ranchu-core.sh | 10 | ||||
| -rw-r--r-- | sensors/sensors_qemu.c | 2 |
2 files changed, 10 insertions, 2 deletions
diff --git a/init.ranchu-core.sh b/init.ranchu-core.sh index 0b2e6fd..e6c9de4 100755 --- a/init.ranchu-core.sh +++ b/init.ranchu-core.sh @@ -11,4 +11,12 @@ case "$bootanim" in esac # take the wake lock -echo "emulator_wake_lock" > /sys/power/wake_lock +allowsuspend=`getprop ro.kernel.qemu.allowsuspend` +case "$allowsuspend" in + "") echo "emulator_wake_lock" > /sys/power/wake_lock + ;; + 1) echo "emulator_wake_lock" > /sys/power/wake_unlock + ;; + *) echo "emulator_wake_lock" > /sys/power/wake_lock + ;; +esac diff --git a/sensors/sensors_qemu.c b/sensors/sensors_qemu.c index 998d1c1..dfa6273 100644 --- a/sensors/sensors_qemu.c +++ b/sensors/sensors_qemu.c @@ -128,7 +128,7 @@ _sensorIdFromName( const char* name ) /* return the current time in nanoseconds */ static int64_t now_ns(void) { struct timespec ts; - clock_gettime(CLOCK_MONOTONIC, &ts); + clock_gettime(CLOCK_BOOTTIME, &ts); return (int64_t)ts.tv_sec * 1000000000 + ts.tv_nsec; } |