summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author RoboErik <epastern@google.com> 2014-03-12 21:12:28 +0000
committer Android Git Automerger <android-git-automerger@android.com> 2014-03-12 21:12:28 +0000
commitffd353a73eb7794ef556c4e646f866b580a03abb (patch)
tree2b37f1c65837b7b6840cdf791af66bc715fb1907
parent85864b8724b3908d2f5aa861276ce5e80d7f820e (diff)
parentd9e113f0e0feac1a801f8339d2f907302bd432c5 (diff)
am d9e113f0: b/12068020 add nonce to InputDeviceDescriptor. Do not merge
* commit 'd9e113f0e0feac1a801f8339d2f907302bd432c5': b/12068020 add nonce to InputDeviceDescriptor. Do not merge
-rw-r--r--include/input/InputDevice.h5
1 files changed, 5 insertions, 0 deletions
diff --git a/include/input/InputDevice.h b/include/input/InputDevice.h
index 1419b451f8..adf9fb9170 100644
--- a/include/input/InputDevice.h
+++ b/include/input/InputDevice.h
@@ -46,6 +46,11 @@ struct InputDeviceIdentifier {
// Ideally, the way this value is computed should not change between Android releases
// because that would invalidate persistent settings that rely on it.
String8 descriptor;
+
+ // A value added to uniquely identify a device in the absence of a unique id. This
+ // is intended to be a minimum way to distinguish from other active devices and may
+ // reuse values that are not associated with an input anymore.
+ uint16_t nonce;
};
/*