KeyInputQueue: get the name of the virtual-keys file from the input-device name
Signed-off-by: Iliyan Malchev <malchev@google.com>
diff --git a/services/java/com/android/server/KeyInputQueue.java b/services/java/com/android/server/KeyInputQueue.java
index cfb3e35..dc7d22b 100644
--- a/services/java/com/android/server/KeyInputQueue.java
+++ b/services/java/com/android/server/KeyInputQueue.java
@@ -194,10 +194,10 @@
}
}
- private void readVirtualKeys() {
+ private void readVirtualKeys(String deviceName) {
try {
FileInputStream fis = new FileInputStream(
- "/sys/board_properties/virtualkeys.synaptics-rmi-touchscreen");
+ "/sys/board_properties/virtualkeys." + deviceName);
InputStreamReader isr = new InputStreamReader(fis);
BufferedReader br = new BufferedReader(isr);
String str = br.readLine();
@@ -276,7 +276,6 @@
mHapticFeedbackCallback = hapticFeedbackCallback;
- readVirtualKeys();
readExcludedDevices();
PowerManager pm = (PowerManager)context.getSystemService(
@@ -393,6 +392,9 @@
synchronized (mFirst) {
di = newInputDevice(ev.deviceId);
mDevices.put(ev.deviceId, di);
+ if ((di.classes & RawInputEvent.CLASS_TOUCHSCREEN) != 0) {
+ readVirtualKeys(di.name);
+ }
configChanged = true;
}
} else if (ev.type == RawInputEvent.EV_DEVICE_REMOVED) {