diff options
author | Andreas Gampe <agampe@google.com> | 2014-11-10 11:51:01 -0800 |
---|---|---|
committer | Andreas Gampe <agampe@google.com> | 2014-11-12 08:04:43 -0800 |
commit | 4c57eda9f4c87bb22eb0acdd2dab4d1757d4280b (patch) | |
tree | fd5c6d7732c58055835a390a9cae6d54d8f9aaa0 /libs/common_time/clock_recovery.cpp | |
parent | 487ae9b8dc3e08c1a830d519a801a07cd59c8f2b (diff) | |
download | frameworks_base-4c57eda9f4c87bb22eb0acdd2dab4d1757d4280b.zip frameworks_base-4c57eda9f4c87bb22eb0acdd2dab4d1757d4280b.tar.gz frameworks_base-4c57eda9f4c87bb22eb0acdd2dab4d1757d4280b.tar.bz2 |
Frameworks/base: Wall Werror in common_time
Turn on warnings and errors in common_time.
Fix a code path in CommonTimeServer::handleSyncResponse in which
and uninitialized variable is returned.
Change-Id: I2f80f063c625f032266647d0507f573370202707
Diffstat (limited to 'libs/common_time/clock_recovery.cpp')
-rw-r--r-- | libs/common_time/clock_recovery.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libs/common_time/clock_recovery.cpp b/libs/common_time/clock_recovery.cpp index 3a7c70c..392caa0 100644 --- a/libs/common_time/clock_recovery.cpp +++ b/libs/common_time/clock_recovery.cpp @@ -22,6 +22,7 @@ #define __STDC_LIMIT_MACROS #define LOG_TAG "common_time" #include <utils/Log.h> +#include <inttypes.h> #include <stdint.h> #include <common_time/local_clock.h> @@ -280,7 +281,7 @@ bool ClockRecoveryLoop::pushDisciplineEvent(int64_t local_time, // system. setTargetCorrection_l(tgt_correction); - LOG_TS("clock_loop %lld %f %f %f %d\n", raw_delta, delta_f, CO, CObias, tgt_correction); + LOG_TS("clock_loop %" PRId64 " %f %f %f %d\n", raw_delta, delta_f, CO, CObias, tgt_correction); #ifdef TIME_SERVICE_DEBUG diag_thread_->pushDisciplineEvent( @@ -335,7 +336,6 @@ void ClockRecoveryLoop::setTargetCorrection_l(int32_t tgt) { // 300mSec. if (tgt_correction_ != tgt) { int64_t now = local_clock_->getLocalTime(); - status_t res; tgt_correction_ = tgt; |