commit d0bd3911462f42487944dbaf85d87d569e2f9633
author Michael Wright <michaelwr@google.com> Wed Mar 19 12:06:10 2014 -0700
committer Michael Wright <michaelwr@google.com> Mon Mar 24 17:26:52 2014 -0700
tree 0f5fdb11559f992295177207b71d78dc7d9cf0b3
parent 40c68757ef51d270174103f31a39a7d268bab3e2

Generate ACTION_CANCEL on joystick disconnect. DO NOT MERGE

Bug: 11480300
Change-Id: I5a4096970c9e588d134f05dd0eb3a9c91c836b2f

include/input/Input.h

diff --git a/include/input/Input.h b/include/input/Input.h
index ea9c4c2..bb5ceaf 100644
--- a/include/input/Input.h
+++ b/include/input/Input.h
@@ -22,11 +22,12 @@
  */
 
 #include <android/input.h>
-#include <utils/Vector.h>
+#include <utils/BitSet.h>
 #include <utils/KeyedVector.h>
-#include <utils/Timers.h>
 #include <utils/RefBase.h>
 #include <utils/String8.h>
+#include <utils/Timers.h>
+#include <utils/Vector.h>
 
 /*
  * Additional private constants not defined in ndk/ui/input.h.
@@ -205,7 +206,11 @@
     float values[MAX_AXES];
 
     inline void clear() {
-        bits = 0;
+        BitSet64::clear(bits);
+    }
+
+    bool isEmpty() const {
+        return BitSet64::isEmpty(bits);
     }
 
     float getAxisValue(int32_t axis) const;