summaryrefslogtreecommitdiffstats
path: root/libs/androidfw/Input.cpp
diff options
context:
space:
mode:
authorJeffrey Brown <jeffbrown@android.com>2013-02-06 20:56:07 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2013-02-06 20:56:07 -0800
commit6b7fcc8f6754f0bf7a406834a6dc066710a9de51 (patch)
tree5dea685569aaba5d36f7cb9576c649f9c832486a /libs/androidfw/Input.cpp
parent8ca4642b7460057be0ee8ba97633d6fb1dfcd532 (diff)
parent75701e8fc92285680637f69e0f004741919ddc10 (diff)
downloadframeworks_base-6b7fcc8f6754f0bf7a406834a6dc066710a9de51.zip
frameworks_base-6b7fcc8f6754f0bf7a406834a6dc066710a9de51.tar.gz
frameworks_base-6b7fcc8f6754f0bf7a406834a6dc066710a9de51.tar.bz2
am 75701e8f: am 7eb4db35: am b9185fd1: Merge "Fix PointerCoords Parcel incorrectly storing values as Int32"
# By Ilya Polenov # Via Android Git Automerger (2) and Gerrit Code Review (2) * commit '75701e8fc92285680637f69e0f004741919ddc10': Fix PointerCoords Parcel incorrectly storing values as Int32
Diffstat (limited to 'libs/androidfw/Input.cpp')
-rw-r--r--libs/androidfw/Input.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/libs/androidfw/Input.cpp b/libs/androidfw/Input.cpp
index 8996f6f..eca692a 100644
--- a/libs/androidfw/Input.cpp
+++ b/libs/androidfw/Input.cpp
@@ -225,7 +225,7 @@ status_t PointerCoords::readFromParcel(Parcel* parcel) {
}
for (uint32_t i = 0; i < count; i++) {
- values[i] = parcel->readInt32();
+ values[i] = parcel->readFloat();
}
return OK;
}
@@ -235,7 +235,7 @@ status_t PointerCoords::writeToParcel(Parcel* parcel) const {
uint32_t count = __builtin_popcountll(bits);
for (uint32_t i = 0; i < count; i++) {
- parcel->writeInt32(values[i]);
+ parcel->writeFloat(values[i]);
}
return OK;
}