From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Josep del Rio Date: Wed, 12 Jul 2023 16:32:05 +0000 Subject: [PATCH] Fix KCM key mapping cloning ag/23792288 tried to fix a security issue by cloning the key mappings, but unfortunately the parcel was not being rewinded. Bug: 274058082 Test: Confirmed change works in newer Android versions (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:aaaba6cf190d976efdc5db6c78997dbdc9214c15) Merged-In: I6f75b9202e20d82ebf81a35a2916e653ee1b8372 Change-Id: I6f75b9202e20d82ebf81a35a2916e653ee1b8372 --- core/jni/android_view_InputDevice.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/core/jni/android_view_InputDevice.cpp b/core/jni/android_view_InputDevice.cpp index 81ada6ad535c..87102d3359a7 100644 --- a/core/jni/android_view_InputDevice.cpp +++ b/core/jni/android_view_InputDevice.cpp @@ -53,6 +53,7 @@ jobject android_view_InputDevice_create(JNIEnv* env, const InputDeviceInfo& devi if (map != nullptr) { Parcel parcel; map->writeToParcel(&parcel); + parcel.setDataPosition(0); map = map->readFromParcel(&parcel); }