diff options
| author | Aravind Akella <aakella@google.com> | 2015-05-09 00:17:40 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-05-09 00:17:40 +0000 |
| commit | be451b57b97c21747c637f4af06743318d42c36c (patch) | |
| tree | d8d37785ff03bc1460df533b993df4b245b80d17 /services/sensorservice | |
| parent | 98a13a1475682870f5121446f9c80aa18855c884 (diff) | |
| parent | 08f04bf36c3f5d2e91de5525dfce778e56464fc2 (diff) | |
| download | frameworks_native-be451b57b97c21747c637f4af06743318d42c36c.zip frameworks_native-be451b57b97c21747c637f4af06743318d42c36c.tar.gz frameworks_native-be451b57b97c21747c637f4af06743318d42c36c.tar.bz2 | |
Merge "Fix the arguments to memcpy." into mnc-dev
Diffstat (limited to 'services/sensorservice')
| -rw-r--r-- | services/sensorservice/SensorService.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/services/sensorservice/SensorService.cpp b/services/sensorservice/SensorService.cpp index c7bcaef..a401145 100644 --- a/services/sensorservice/SensorService.cpp +++ b/services/sensorservice/SensorService.cpp @@ -1709,7 +1709,7 @@ int SensorService::SensorEventConnection::handleEvent(int fd, int events, void* #endif } else if (numBytesRead == sizeof(uint32_t)) { uint32_t numAcks = 0; - memcpy(&numAcks, buf, sizeof(numBytesRead)); + memcpy(&numAcks, buf, numBytesRead); // Sanity check to ensure there are no read errors in recv, numAcks is always // within the range and not zero. If any of the above don't hold reset // mWakeLockRefCount to zero. |