diff options
author | Chih-hung Hsieh | 2014-11-25 17:55:52 -0600 |
---|---|---|
committer | Android Git Automerger | 2014-11-25 17:55:52 -0600 |
commit | 7d831769fce188251afb02e6b933be7bdfe504b4 (patch) | |
tree | 54bbad152e02526850566e9b50ec332f9bcf84ad /services/sensorservice | |
parent | a7c75d1b17556d9842a7823c94a2c96982687c63 (diff) | |
parent | 46ca041f43e3d80029782b12c994b232dc01b5d5 (diff) | |
download | frameworks-native-7d831769fce188251afb02e6b933be7bdfe504b4.tar.gz frameworks-native-7d831769fce188251afb02e6b933be7bdfe504b4.tar.xz frameworks-native-7d831769fce188251afb02e6b933be7bdfe504b4.zip |
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
Diffstat (limited to 'services/sensorservice')
-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 8719487e2..e9ca3a59f 100644 --- a/services/sensorservice/SensorService.h +++ b/services/sensorservice/SensorService.h | |||
@@ -37,6 +37,13 @@ | |||
37 | 37 | ||
38 | #include "SensorInterface.h" | 38 | #include "SensorInterface.h" |
39 | 39 | ||
40 | #if __clang__ | ||
41 | // Clang warns about SensorEventConnection::dump hiding BBinder::dump | ||
42 | // The cause isn't fixable without changing the API, so let's tell clang | ||
43 | // this is indeed intentional. | ||
44 | #pragma clang diagnostic ignored "-Woverloaded-virtual" | ||
45 | #endif | ||
46 | |||
40 | // --------------------------------------------------------------------------- | 47 | // --------------------------------------------------------------------------- |
41 | 48 | ||
42 | #define DEBUG_CONNECTIONS false | 49 | #define DEBUG_CONNECTIONS false |