am c9183441: Merge "Remove unused systemTime() and include utils/Timers.h."

* commit 'c9183441b7faa8d943bffa60da31b39159056de4':
  Remove unused systemTime() and include utils/Timers.h.
This commit is contained in:
Daniel Erat 2015-08-10 16:55:26 +00:00 committed by Android Git Automerger
commit eea5d8878d
3 changed files with 2 additions and 10 deletions

View file

@ -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"

View file

@ -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>

View file

@ -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[])
{