diff options
| author | Daniel Erat <derat@google.com> | 2015-08-10 16:54:58 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-08-10 16:54:58 +0000 |
| commit | e0a795eec4f410369fd64858d900eae2d412c9d0 (patch) | |
| tree | c156bcad5f338d5aea18009464e7a7dd7c187679 | |
| parent | 6d604a605e6d8452398e40c904e9c74926aba2ca (diff) | |
| parent | c9183441b7faa8d943bffa60da31b39159056de4 (diff) | |
| download | libhardware_legacy-e0a795eec4f410369fd64858d900eae2d412c9d0.tar.gz | |
am c9183441: Merge "Remove unused systemTime() and include utils/Timers.h."
* commit 'c9183441b7faa8d943bffa60da31b39159056de4':
Remove unused systemTime() and include utils/Timers.h.
| -rw-r--r-- | audio/A2dpAudioInterface.cpp | 1 | ||||
| -rw-r--r-- | audio/AudioPolicyManagerBase.cpp | 1 | ||||
| -rw-r--r-- | power/power.c | 10 |
3 files changed, 2 insertions, 10 deletions
diff --git a/audio/A2dpAudioInterface.cpp b/audio/A2dpAudioInterface.cpp index 4ab52ba..50708ba 100644 --- a/audio/A2dpAudioInterface.cpp +++ b/audio/A2dpAudioInterface.cpp @@ -20,6 +20,7 @@ #define LOG_TAG "A2dpAudioInterface" #include <utils/Log.h> #include <utils/String8.h> +#include <utils/Timers.h> #include "A2dpAudioInterface.h" #include "audio/liba2dp.h" diff --git a/audio/AudioPolicyManagerBase.cpp b/audio/AudioPolicyManagerBase.cpp index 85b0084..5774db2 100644 --- a/audio/AudioPolicyManagerBase.cpp +++ b/audio/AudioPolicyManagerBase.cpp @@ -36,6 +36,7 @@ #include <cutils/properties.h> #include <utils/Log.h> +#include <utils/Timers.h> #include <hardware/audio.h> #include <hardware/audio_effect.h> diff --git a/power/power.c b/power/power.c index e0eda2d..77e2463 100644 --- a/power/power.c +++ b/power/power.c @@ -19,8 +19,6 @@ #include <stdlib.h> #include <stdio.h> #include <unistd.h> -#include <sys/time.h> -#include <time.h> #include <errno.h> #include <string.h> #include <sys/stat.h> @@ -51,14 +49,6 @@ static int g_initialized = 0; static int g_fds[OUR_FD_COUNT]; static int g_error = 1; -static int64_t systemTime() -{ - struct timespec t; - t.tv_sec = t.tv_nsec = 0; - clock_gettime(CLOCK_MONOTONIC, &t); - return t.tv_sec*1000000000LL + t.tv_nsec; -} - static int open_file_descriptors(const char * const paths[]) { |