diff options
| author | Jeff Brown <jeffbrown@google.com> | 2011-07-13 13:00:38 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-07-13 13:00:38 -0700 |
| commit | 023e8c72e9f5ab882f8413c6073e34531a7a794a (patch) | |
| tree | 7da170ec0070b2769f4c2d7dcb49cef2d43e562b /services/input | |
| parent | 3ac60ada279e2cd24001c0f084982b7e14532ea6 (diff) | |
| parent | b99a82437cc999ecee143b82482dae36c13049f3 (diff) | |
| download | frameworks_base-023e8c72e9f5ab882f8413c6073e34531a7a794a.zip frameworks_base-023e8c72e9f5ab882f8413c6073e34531a7a794a.tar.gz frameworks_base-023e8c72e9f5ab882f8413c6073e34531a7a794a.tar.bz2 | |
Merge "Revert "fix a weird use of Vector::appendVector()""
Diffstat (limited to 'services/input')
| -rw-r--r-- | services/input/InputDispatcher.cpp | 7 |
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, |