am 4782cdbb: Merge "Fix a memory corruption when writting Sensor into a parcel" into gingerbread

Merge commit '4782cdbbbe4b2c7714af1fb6cdc4f52f1d1d20d7' into gingerbread-plus-aosp

* commit '4782cdbbbe4b2c7714af1fb6cdc4f52f1d1d20d7':
  Fix a memory corruption when writting Sensor into a parcel
This commit is contained in:
Mathias Agopian
2010-07-22 20:09:09 -07:00
committed by Android Git Automerger

View File

@@ -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