Merge "Swap width and height in TouchVideoFrame"

1 files changed, 6 insertions, 6 deletions

diff --git a/libs/input/TouchVideoFrame.cpp b/libs/input/TouchVideoFrame.cpp
index 2c47fdf36f..35cb4a73ea 100644
--- a/libs/input/TouchVideoFrame.cpp
+++ b/libs/input/TouchVideoFrame.cpp
@@ -18,23 +18,23 @@
 
 namespace android {
 
-TouchVideoFrame::TouchVideoFrame(uint32_t width, uint32_t height, std::vector<int16_t> data,
+TouchVideoFrame::TouchVideoFrame(uint32_t height, uint32_t width, std::vector<int16_t> data,
         const struct timeval& timestamp) :
-        mWidth(width), mHeight(height), mData(std::move(data)), mTimestamp(timestamp) {
+         mHeight(height), mWidth(width),mData(std::move(data)), mTimestamp(timestamp) {
 }
 
 bool TouchVideoFrame::operator==(const TouchVideoFrame& rhs) const {
-    return mWidth == rhs.mWidth
-            && mHeight == rhs.mHeight
+    return mHeight == rhs.mHeight
+            && mWidth == rhs.mWidth
             && mData == rhs.mData
             && mTimestamp.tv_sec == rhs.mTimestamp.tv_sec
             && mTimestamp.tv_usec == rhs.mTimestamp.tv_usec;
 }
 
-uint32_t TouchVideoFrame::getWidth() const { return mWidth; }
-
 uint32_t TouchVideoFrame::getHeight() const { return mHeight; }
 
+uint32_t TouchVideoFrame::getWidth() const { return mWidth; }
+
 const std::vector<int16_t>& TouchVideoFrame::getData() const { return mData; }
 
 const struct timeval& TouchVideoFrame::getTimestamp() const { return mTimestamp; }