Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d671e2b9 authored by Mathias Agopian's avatar Mathias Agopian Committed by Android Git Automerger
Browse files

am 1db0e88e: am 4782cdbb: Merge "Fix a memory corruption when writting Sensor...

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
parents 0da155ae 84101fe0
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -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