Merge commit '71997c1a' into manualmerge

Change-Id: Ia68fbd20ce66571dfd33764e52c3a00e2285e648

diff --cc include/android/input.h
index 7b76539,efbbb85..5ab4e29
--- 1/include/android/input.h
--- 2/include/android/input.h
+++ b/include/android/input.h
@@@ -788,35 -444,21 +788,37 @@@ enum 
      AINPUT_SOURCE_CLASS_JOYSTICK = 0x00000010,
  };
  
 +/**
 + * Input sources.
 + */
  enum {
 +    /** unknown */
      AINPUT_SOURCE_UNKNOWN = 0x00000000,
  
 +    /** keyboard */
      AINPUT_SOURCE_KEYBOARD = 0x00000100 | AINPUT_SOURCE_CLASS_BUTTON,
 +    /** dpad */
      AINPUT_SOURCE_DPAD = 0x00000200 | AINPUT_SOURCE_CLASS_BUTTON,
 +    /** gamepad */
      AINPUT_SOURCE_GAMEPAD = 0x00000400 | AINPUT_SOURCE_CLASS_BUTTON,
 +    /** touchscreen */
      AINPUT_SOURCE_TOUCHSCREEN = 0x00001000 | AINPUT_SOURCE_CLASS_POINTER,
 +    /** mouse */
      AINPUT_SOURCE_MOUSE = 0x00002000 | AINPUT_SOURCE_CLASS_POINTER,
 +    /** stylus */
      AINPUT_SOURCE_STYLUS = 0x00004000 | AINPUT_SOURCE_CLASS_POINTER,
++    /** bluetooth stylus */
+     AINPUT_SOURCE_BLUETOOTH_STYLUS = 0x00008000 | AINPUT_SOURCE_STYLUS,
 +    /** trackball */
      AINPUT_SOURCE_TRACKBALL = 0x00010000 | AINPUT_SOURCE_CLASS_NAVIGATION,
 +    /** touchpad */
      AINPUT_SOURCE_TOUCHPAD = 0x00100000 | AINPUT_SOURCE_CLASS_POSITION,
 +    /** navigation */
      AINPUT_SOURCE_TOUCH_NAVIGATION = 0x00200000 | AINPUT_SOURCE_CLASS_NONE,
 +    /** joystick */
      AINPUT_SOURCE_JOYSTICK = 0x01000000 | AINPUT_SOURCE_CLASS_JOYSTICK,
  
 +    /** any */
      AINPUT_SOURCE_ANY = 0xffffff00,
  };
  

diff --cc services/inputflinger/InputReader.cpp
Simple merge