diff options
| author | Jeff Brown <jeffbrown@android.com> | 2011-06-06 21:08:25 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-06-06 21:08:25 -0700 |
| commit | fd3244868dec40707039cd616dd37ada41774547 (patch) | |
| tree | 15637752ea962a822af175a814851757819b5843 /services | |
| parent | bbbab26ebe9bc789ba9abac757895a6c31de7cc5 (diff) | |
| parent | 5cb05eea289559b30cf4f84130cb6afba0921638 (diff) | |
| download | frameworks_base-fd3244868dec40707039cd616dd37ada41774547.zip frameworks_base-fd3244868dec40707039cd616dd37ada41774547.tar.gz frameworks_base-fd3244868dec40707039cd616dd37ada41774547.tar.bz2 | |
am 5cb05eea: Merge "Fix build." into honeycomb-mr2
* commit '5cb05eea289559b30cf4f84130cb6afba0921638':
Fix build.
Diffstat (limited to 'services')
| -rw-r--r-- | services/input/tests/InputReader_test.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/services/input/tests/InputReader_test.cpp b/services/input/tests/InputReader_test.cpp index e85ae1f..aef9fd8 100644 --- a/services/input/tests/InputReader_test.cpp +++ b/services/input/tests/InputReader_test.cpp @@ -101,8 +101,8 @@ private: virtual void setPresentation(Presentation presentation) { } - virtual void setSpots(SpotGesture spotGesture, - const PointerCoords* spotCoords, const uint32_t* spotIdToIndex, BitSet32 spotIdBits) { + virtual void setSpots(const PointerCoords* spotCoords, + const uint32_t* spotIdToIndex, BitSet32 spotIdBits) { } virtual void clearSpots() { |