| commit | 625177aa35d33c12b441143edaf331114d98ce0d | [log] [tgz] |
|---|---|---|
| author | Mathias Agopian <mathias@google.com> | Thu Jul 22 20:07:01 2010 -0700 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Thu Jul 22 20:07:01 2010 -0700 |
| tree | 7f918cd2ee1698160c73c94d9229a6c4660c6e7d | |
| parent | 84a7d07f45fb5aa4bb0e1ad143cb72d10de92e44 [diff] | |
| parent | d03d9ced3fe0c115bd7af5537cdb57e94e165005 [diff] |
Merge "Fix a memory corruption when writting Sensor into a parcel" into gingerbread
diff --git a/libs/gui/Sensor.cpp b/libs/gui/Sensor.cpp index 48e1cb7..cb85df9 100644 --- a/libs/gui/Sensor.cpp +++ b/libs/gui/Sensor.cpp
@@ -89,7 +89,7 @@ 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