am 7d831769: am 46ca041f: Merge "Don\'t error out because SensorEventConnection::dump overloads BBinder::dump"

* commit '7d831769fce188251afb02e6b933be7bdfe504b4':
  Don't error out because SensorEventConnection::dump overloads BBinder::dump
This commit is contained in:
Chih-hung Hsieh 2014-11-26 00:01:55 +00:00 committed by Android Git Automerger
commit c4764f9e57

View File

@ -37,6 +37,13 @@
#include "SensorInterface.h" #include "SensorInterface.h"
#if __clang__
// Clang warns about SensorEventConnection::dump hiding BBinder::dump
// The cause isn't fixable without changing the API, so let's tell clang
// this is indeed intentional.
#pragma clang diagnostic ignored "-Woverloaded-virtual"
#endif
// --------------------------------------------------------------------------- // ---------------------------------------------------------------------------
#define DEBUG_CONNECTIONS false #define DEBUG_CONNECTIONS false