summaryrefslogtreecommitdiff
path: root/libs
diff options
context:
space:
mode:
author Mathias Agopian <mathias@google.com> 2010-07-22 20:07:01 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 2010-07-22 20:07:01 -0700
commit4782cdbbbe4b2c7714af1fb6cdc4f52f1d1d20d7 (patch)
treef07066831ef068eaadda118fa5e4b5701a17d254 /libs
parent19f082ebe859da5191ccab5f38058513c32b3d05 (diff)
parentb54a3c95801da5464bbfcbb551545b543ca4d46c (diff)
Merge "Fix a memory corruption when writting Sensor into a parcel" into gingerbread
Diffstat (limited to 'libs')
-rw-r--r--libs/gui/Sensor.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/libs/gui/Sensor.cpp b/libs/gui/Sensor.cpp
index 48e1cb7a9042..cb85df9bb04d 100644
--- a/libs/gui/Sensor.cpp
+++ b/libs/gui/Sensor.cpp
@@ -89,7 +89,7 @@ size_t Sensor::getFlattenedSize() const
return sizeof(int32_t) + ((mName.length() + 3) & ~3) +
sizeof(int32_t) + ((mVendor.length() + 3) & ~3) +
sizeof(int32_t) * 2 +
- sizeof(float) * 3;
+ sizeof(float) * 4;
}
size_t Sensor::getFdCount() const