diff options
| author | Steve Paik <spaik@google.com> | 2017-12-20 15:09:21 -0800 |
|---|---|---|
| committer | Steve Paik <spaik@google.com> | 2017-12-20 17:02:31 -0800 |
| commit | db8877463118b91e6db722187be9c14eee7003a1 (patch) | |
| tree | cf9e55fc30271717f8c914aa6e12954726f8c736 | |
| parent | dbbba76f88d6a5d06696acd8369548f9cf7946ab (diff) | |
| download | system_core-db8877463118b91e6db722187be9c14eee7003a1.tar.gz system_core-db8877463118b91e6db722187be9c14eee7003a1.tar.bz2 system_core-db8877463118b91e6db722187be9c14eee7003a1.zip | |
Convert autosuspend_wakeup_count.c to cpp
Change this file to cpp before cleaning it up.
Bug: 70669809
Test: Suspend works
Change-Id: Ice927dbb205447a94f33b417e32f7c2cd79613eb
| -rw-r--r-- | libsuspend/Android.bp | 2 | ||||
| -rw-r--r-- | libsuspend/autosuspend_ops.h | 2 | ||||
| -rw-r--r-- | libsuspend/autosuspend_wakeup_count.cpp (renamed from libsuspend/autosuspend_wakeup_count.c) | 6 |
3 files changed, 6 insertions, 4 deletions
diff --git a/libsuspend/Android.bp b/libsuspend/Android.bp index 32f1e1ff8..fa06dc45f 100644 --- a/libsuspend/Android.bp +++ b/libsuspend/Android.bp @@ -9,7 +9,7 @@ cc_library { srcs: [ "autosuspend.c", - "autosuspend_wakeup_count.c", + "autosuspend_wakeup_count.cpp", ], export_include_dirs: ["include"], local_include_dirs: ["include"], diff --git a/libsuspend/autosuspend_ops.h b/libsuspend/autosuspend_ops.h index 2f435d97f..357b82827 100644 --- a/libsuspend/autosuspend_ops.h +++ b/libsuspend/autosuspend_ops.h @@ -23,6 +23,8 @@ struct autosuspend_ops { void (*set_wakeup_callback)(void (*func)(bool success)); }; +__BEGIN_DECLS struct autosuspend_ops *autosuspend_wakeup_count_init(void); +__END_DECLS #endif diff --git a/libsuspend/autosuspend_wakeup_count.c b/libsuspend/autosuspend_wakeup_count.cpp index 81cb44cd9..30f842738 100644 --- a/libsuspend/autosuspend_wakeup_count.c +++ b/libsuspend/autosuspend_wakeup_count.cpp @@ -21,8 +21,8 @@ #include <fcntl.h> #include <pthread.h> #include <semaphore.h> -#include <stddef.h> #include <stdbool.h> +#include <stddef.h> #include <string.h> #include <sys/param.h> #include <sys/stat.h> @@ -68,8 +68,8 @@ static void* suspend_thread_func(void* arg __attribute__((unused))) { success = false; ALOGV("%s: read wakeup_count", __func__); lseek(wakeup_count_fd, 0, SEEK_SET); - wakeup_count_len = TEMP_FAILURE_RETRY(read(wakeup_count_fd, wakeup_count, - sizeof(wakeup_count))); + wakeup_count_len = + TEMP_FAILURE_RETRY(read(wakeup_count_fd, wakeup_count, sizeof(wakeup_count))); if (wakeup_count_len < 0) { strerror_r(errno, buf, sizeof(buf)); ALOGE("Error reading from %s: %s", SYS_POWER_WAKEUP_COUNT, buf); |