diff options
| author | Chih-hung Hsieh <chh@google.com> | 2014-11-25 23:55:52 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-11-25 23:55:52 +0000 |
| commit | 7d831769fce188251afb02e6b933be7bdfe504b4 (patch) | |
| tree | 54bbad152e02526850566e9b50ec332f9bcf84ad | |
| parent | a7c75d1b17556d9842a7823c94a2c96982687c63 (diff) | |
| parent | 46ca041f43e3d80029782b12c994b232dc01b5d5 (diff) | |
| download | frameworks_native-7d831769fce188251afb02e6b933be7bdfe504b4.zip frameworks_native-7d831769fce188251afb02e6b933be7bdfe504b4.tar.gz frameworks_native-7d831769fce188251afb02e6b933be7bdfe504b4.tar.bz2 | |
am 46ca041f: Merge "Don\'t error out because SensorEventConnection::dump overloads BBinder::dump"
* commit '46ca041f43e3d80029782b12c994b232dc01b5d5':
Don't error out because SensorEventConnection::dump overloads BBinder::dump
| -rw-r--r-- | services/sensorservice/SensorService.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/services/sensorservice/SensorService.h b/services/sensorservice/SensorService.h index 8719487..e9ca3a5 100644 --- a/services/sensorservice/SensorService.h +++ b/services/sensorservice/SensorService.h @@ -37,6 +37,13 @@ #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 |