summaryrefslogtreecommitdiffstats
path: root/services/input
diff options
context:
space:
mode:
authorJeff Brown <jeffbrown@google.com>2011-07-13 12:51:11 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2011-07-13 12:51:11 -0700
commitb99a82437cc999ecee143b82482dae36c13049f3 (patch)
tree9c0d9cadab1a2ddc91a56b0a16a23f026c1ccb09 /services/input
parent198fd888add624cf9e53ce31b776568a5d069916 (diff)
downloadframeworks_base-b99a82437cc999ecee143b82482dae36c13049f3.zip
frameworks_base-b99a82437cc999ecee143b82482dae36c13049f3.tar.gz
frameworks_base-b99a82437cc999ecee143b82482dae36c13049f3.tar.bz2
Revert "fix a weird use of Vector::appendVector()"
This reverts commit 198fd888add624cf9e53ce31b776568a5d069916 This change seems to have exposed some other bugs. Bug: 5026631
Diffstat (limited to 'services/input')
-rw-r--r--services/input/InputDispatcher.cpp7
1 files changed, 5 insertions, 2 deletions
diff --git a/services/input/InputDispatcher.cpp b/services/input/InputDispatcher.cpp
index da9b55c..10b9083 100644
--- a/services/input/InputDispatcher.cpp
+++ b/services/input/InputDispatcher.cpp
@@ -3154,9 +3154,11 @@ void InputDispatcher::setInputWindows(const Vector<InputWindow>& inputWindows) {
mLastHoverWindow = NULL;
}
+ mWindows.clear();
+
// Loop over new windows and rebuild the necessary window pointers for
// tracking focus and touch.
- mWindows = inputWindows;
+ mWindows.appendVector(inputWindows);
size_t numWindows = mWindows.size();
for (size_t i = 0; i < numWindows; i++) {
@@ -4558,7 +4560,8 @@ void InputDispatcher::TouchState::copyFrom(const TouchState& other) {
split = other.split;
deviceId = other.deviceId;
source = other.source;
- windows = other.windows;
+ windows.clear();
+ windows.appendVector(other.windows);
}
void InputDispatcher::TouchState::addOrUpdateWindow(const InputWindow* window,