summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Mathias Agopian <mathias@google.com> 2010-07-22 20:11:54 -0700
committer Android Git Automerger <android-git-automerger@android.com> 2010-07-22 20:11:54 -0700
commitb84b7e8f2172964fb32598728cc25cada73cb148 (patch)
treee2138223e1e5d355cad4f25b34ef305cb5ed59df
parent3bb46be774b516f4376e61cb412a35e712e1d1d1 (diff)
parent1db0e88e60ca4f99edff149fe2ab8499e749df47 (diff)
am 1db0e88e: am 4782cdbb: Merge "Fix a memory corruption when writting Sensor into a parcel" into gingerbread
Merge commit '1db0e88e60ca4f99edff149fe2ab8499e749df47' * commit '1db0e88e60ca4f99edff149fe2ab8499e749df47': Fix a memory corruption when writting Sensor into a parcel
-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