Merge lp:mir/0.18 into lp:mir/ubuntu

[Kevin DuBois]

Mir release 0.18.0

.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:3149
http://jenkins.qa.ubuntu.com/job/mir-ubuntu-ci/96/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-android-wily-i386-build/52/console
    FAILURE: http://s-jenkins.ubuntu-ci:8080/job/mir-clang-ts-wily-amd64-build/469/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-clang-wily-amd64-build/1141/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-ubuntu-wily-amd64-ci/51
        deb: http://jenkins.qa.ubuntu.com/job/mir-ubuntu-wily-amd64-ci/51/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-ubuntu-wily-armhf-ci/54/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mir-ubuntu-ci/96/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:3150
http://jenkins.qa.ubuntu.com/job/mir-ubuntu-ci/98/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-android-wily-i386-build/54/console
    FAILURE: http://s-jenkins.ubuntu-ci:8080/job/mir-clang-ts-wily-amd64-build/471/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-clang-wily-amd64-build/1143/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-ubuntu-wily-amd64-ci/53/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-ubuntu-wily-armhf-ci/56/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mir-ubuntu-ci/98/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:3151
http://jenkins.qa.ubuntu.com/job/mir-ubuntu-ci/100/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-android-wily-i386-build/56/console
    FAILURE: http://s-jenkins.ubuntu-ci:8080/job/mir-clang-ts-wily-amd64-build/473/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-clang-wily-amd64-build/1145/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-ubuntu-wily-amd64-ci/55
        deb: http://jenkins.qa.ubuntu.com/job/mir-ubuntu-wily-amd64-ci/55/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-ubuntu-wily-armhf-ci/58/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mir-ubuntu-ci/100/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:3172
http://jenkins.qa.ubuntu.com/job/mir-ubuntu-ci/102/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-android-wily-i386-build/58/console
    FAILURE: http://s-jenkins.ubuntu-ci:8080/job/mir-clang-ts-wily-amd64-build/475/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-clang-wily-amd64-build/1147/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-ubuntu-wily-amd64-ci/57
        deb: http://jenkins.qa.ubuntu.com/job/mir-ubuntu-wily-amd64-ci/57/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-ubuntu-wily-armhf-ci/60/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mir-ubuntu-ci/102/rebuild

review: Needs Fixing (continuous-integration)

[Daniel van Vugt (vanvugt)]

Needs fixing: r3171 appears to have introduced things that should not be here:
  * Shipping both .pc files was a temporary fix for series 0.17 which we agreed would not happen in 0.18; and
  * Duplicate code accidentally introduced in surface_stack.cpp.

I think you need to revert r3171 and fix conflicts a different way.

review: Needs Fixing

[Daniel van Vugt (vanvugt)]

Also needs fixing: bug 1522673

review: Needs Fixing

[Alberto Aguirre (albaguirre)]

mirclient symbol stanza should not have MIR_CLIENT_unreleased, MIR_CLIENT_DETAIL_unreleased

review: Needs Fixing

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:3173
http://jenkins.qa.ubuntu.com/job/mir-ubuntu-ci/104/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-android-wily-i386-build/60/console
    FAILURE: http://s-jenkins.ubuntu-ci:8080/job/mir-clang-ts-wily-amd64-build/477/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-clang-wily-amd64-build/1149/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-ubuntu-wily-amd64-ci/59
        deb: http://jenkins.qa.ubuntu.com/job/mir-ubuntu-wily-amd64-ci/59/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-ubuntu-wily-armhf-ci/62/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mir-ubuntu-ci/104/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:3174
http://jenkins.qa.ubuntu.com/job/mir-ubuntu-ci/105/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-android-wily-i386-build/61/console
    FAILURE: http://s-jenkins.ubuntu-ci:8080/job/mir-clang-ts-wily-amd64-build/478/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-clang-wily-amd64-build/1150/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-ubuntu-wily-amd64-ci/60
        deb: http://jenkins.qa.ubuntu.com/job/mir-ubuntu-wily-amd64-ci/60/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-ubuntu-wily-armhf-ci/63/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mir-ubuntu-ci/105/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:3176
http://jenkins.qa.ubuntu.com/job/mir-ubuntu-ci/106/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-android-wily-i386-build/62/console
    FAILURE: http://s-jenkins.ubuntu-ci:8080/job/mir-clang-ts-wily-amd64-build/479/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-clang-wily-amd64-build/1151/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-ubuntu-wily-amd64-ci/61
        deb: http://jenkins.qa.ubuntu.com/job/mir-ubuntu-wily-amd64-ci/61/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-ubuntu-wily-armhf-ci/64/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mir-ubuntu-ci/106/rebuild

review: Needs Fixing (continuous-integration)

[Daniel van Vugt (vanvugt)]

I'm no longer aware of anything wrong with this branch. Although there are some sanity checks I haven't got around to yet.

review: Abstain

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:3177
http://jenkins.qa.ubuntu.com/job/mir-ubuntu-ci/107/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-android-wily-i386-build/63/console
    FAILURE: http://s-jenkins.ubuntu-ci:8080/job/mir-clang-ts-wily-amd64-build/480/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-clang-wily-amd64-build/1152/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-ubuntu-wily-amd64-ci/62
        deb: http://jenkins.qa.ubuntu.com/job/mir-ubuntu-wily-amd64-ci/62/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-ubuntu-wily-armhf-ci/65/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mir-ubuntu-ci/107/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:3179
http://jenkins.qa.ubuntu.com/job/mir-ubuntu-ci/108/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-android-wily-i386-build/64/console
    FAILURE: http://s-jenkins.ubuntu-ci:8080/job/mir-clang-ts-wily-amd64-build/481/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-clang-wily-amd64-build/1153/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-ubuntu-wily-amd64-ci/63
        deb: http://jenkins.qa.ubuntu.com/job/mir-ubuntu-wily-amd64-ci/63/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-ubuntu-wily-armhf-ci/66/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mir-ubuntu-ci/108/rebuild

review: Needs Fixing (continuous-integration)

[Daniel van Vugt (vanvugt)]

Hmm, it seems the new input code in 0.18 might be causing a lot of the new test failures, not to mention is annoying to use in practice (mouse acceleration too high). Maybe we should consider fixing that up before releasing...

https://bugs.launchpad.net/mir/+bugs?field.tag=pointer-events

It's possible that simply killing the acceleration that's been introduced will solve all of them at once.

review: Needs Information

[Kevin DuBois (kdub)]

I guess the critical question here is whether we should block release. I'm not very familiar with this part of the code, but from chatting with Andreas on IRC today, it seems like:

The linked test failures should be using the stub input platform, so they're not related to the libinput switchover.

The pointer acceleration topic (lp: #1522295) seems like something to look into, but it hasn't affected release testing, and the pointer acceleration is also something needed by PocketDesktop.

This is a judgement call (and one from someone not very entrenched in the input code at that), but it doesn't seem like this should block the release.

[Andreas Pokorny (andreas-pokorny)]

> Hmm, it seems the new input code in 0.18 might be causing a lot of the new
> test failures, not to mention is annoying to use in practice (mouse
> acceleration too high). Maybe we should consider fixing that up before
> releasing...

I suggest we analyse the test failures. Those are btw not related to libinput or pointer acceleration. Since those test cases use the input-stub to simulate input events. This is the case for a few of releases. Acceleration or rather device configuration on input-stub can be tested, but the acceleration is disabled by default. The code used there just scales relative movement with a single factor which is 1.0 by default. So the cause for the failure might be somewhere else.

>
> https://bugs.launchpad.net/mir/+bugs?field.tag=pointer-events
>
> It's possible that simply killing the acceleration that's been introduced will
> solve all of them at once.

And that would reopen:
https://bugs.launchpad.net/mir/+bug/1517133

[Alberto Aguirre (albaguirre)]

Ok unblocking since symbol stanza has been fixed

review: Abstain

[Kevin DuBois (kdub)]

Blocking bug discovered during MX4 testing:
http://bugs.launchpad.net/mir/+bug/1524414

[kevin gunn (kgunn72)]

Complete testing on PD and windowed mode - all is good.
I'm definitely not in favor of blocking on mouse accel.

[Daniel van Vugt (vanvugt)]

It's just a matter of usability. Mir up to version 0.17 is nice to use with a mouse. Mir 0.18 and later however (presently) is awful. So if it motivates people to not like it, that can become an issue.

review: Abstain

[Kevin DuBois (kdub)]

> Blocking bug discovered during MX4 testing:
> http://bugs.launchpad.net/mir/+bug/1524414

Bug was that the driver will reset the depth buffer when adding sync fences to the stream. Reverting patch, until palatable workaround is found.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:3180
http://jenkins.qa.ubuntu.com/job/mir-ubuntu-ci/109/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-android-wily-i386-build/65/console
    FAILURE: http://s-jenkins.ubuntu-ci:8080/job/mir-clang-ts-wily-amd64-build/482/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-clang-wily-amd64-build/1154/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-ubuntu-wily-amd64-ci/64
        deb: http://jenkins.qa.ubuntu.com/job/mir-ubuntu-wily-amd64-ci/64/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-ubuntu-wily-armhf-ci/67/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mir-ubuntu-ci/109/rebuild

review: Needs Fixing (continuous-integration)

[Daniel van Vugt (vanvugt)]

In r3180 you forgot to rename/move egl_extensions.h back to the old location. Do we care?

Also: https://code.launchpad.net/~kdub/mir/revert-sync-factory/+merge/280293

review: Needs Information

[Kevin DuBois (kdub)]

I suppose it should be reprivatized for now.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:3181
http://jenkins.qa.ubuntu.com/job/mir-ubuntu-ci/110/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-android-wily-i386-build/66/console
    FAILURE: http://s-jenkins.ubuntu-ci:8080/job/mir-clang-ts-wily-amd64-build/483/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-clang-wily-amd64-build/1155/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-ubuntu-wily-amd64-ci/65
        deb: http://jenkins.qa.ubuntu.com/job/mir-ubuntu-wily-amd64-ci/65/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-ubuntu-wily-armhf-ci/68/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mir-ubuntu-ci/110/rebuild

review: Needs Fixing (continuous-integration)

[Daniel van Vugt (vanvugt)]

Please check bug 1526209. Seems to be new and only occur in Mir 0.18 and later.

review: Needs Fixing

[Kevin DuBois (kdub)]

Did a bit of checking this morning. The bug didn't seem to be reproducible on Alan's, Andreas's, Alberto's, Cemil's, and my system, once the environment variables, packages, and --vt accommodation was set up properly. After some discussion in the standup today, it seems we aren't considering 1526209 a blocker.

[Kevin DuBois (kdub)]

So, 1526209 doesn't seem to be a blocker in and of itself, but there is an additional blocker that the desktop session isn't starting due to confusion surrounding this option behavior changes. Branch is now blocked again

[lp:mir/0.18]

3182. By Kevin DuBois on 2015-12-15

revert changes to vt option passing. reverts rev 3098, and fixes u8 desktop session (lp: #1526505)

[Kevin DuBois (kdub)]

after a fair amount of back and forth/testing, back out rev 3098 to get the u8 stack working again (fix lp: #1526505). We weren't able to reproduce lp: #1526209, but backing this out will hopefully avert/fix that problem too.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:3182
http://jenkins.qa.ubuntu.com/job/mir-ubuntu-ci/111/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-android-wily-i386-build/67/console
    FAILURE: http://s-jenkins.ubuntu-ci:8080/job/mir-clang-ts-wily-amd64-build/484/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-clang-wily-amd64-build/1156/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-ubuntu-wily-amd64-ci/66
        deb: http://jenkins.qa.ubuntu.com/job/mir-ubuntu-wily-amd64-ci/66/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-ubuntu-wily-armhf-ci/69/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mir-ubuntu-ci/111/rebuild

review: Needs Fixing (continuous-integration)

[Daniel van Vugt (vanvugt)]

review: Abstain

[lp:mir/0.18]

3183. By Kevin DuBois on 2015-12-16

readd fix and regressions introduced in 3098

3184. By Kevin DuBois on 2015-12-16

merge in lp:~andreas-pokorny/mir/bandaid-probing-kms-when-nested, which hopefully leaves the fix for 1506707 without reintroducing the regressions

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:3184
http://jenkins.qa.ubuntu.com/job/mir-ubuntu-ci/112/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-android-wily-i386-build/68/console
    FAILURE: http://s-jenkins.ubuntu-ci:8080/job/mir-clang-ts-wily-amd64-build/485/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-clang-wily-amd64-build/1157/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-ubuntu-wily-amd64-ci/67
        deb: http://jenkins.qa.ubuntu.com/job/mir-ubuntu-wily-amd64-ci/67/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-ubuntu-wily-armhf-ci/70/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mir-ubuntu-ci/112/rebuild

review: Needs Fixing (continuous-integration)

[Andreas Pokorny (andreas-pokorny)]

seems to work fine..

review: Approve

=== modified file '3rd_party/CMakeLists.txt'
--- 3rd_party/CMakeLists.txt	2015-06-17 05:20:42 +0000
+++ 3rd_party/CMakeLists.txt	2015-12-16 17:01:34 +0000
@@ -21,11 +21,3 @@
   MIR_ANDROID_INPUT_COMPILE_FLAGS
   ${MIR_ANDROID_INPUT_COMPILE_FLAGS}
   PARENT_SCOPE)
-
-add_subdirectory(xcursor)
-list(
-  APPEND MIR_XCURSOR_INCLUDE_DIRECTORIES
-  ${CMAKE_CURRENT_SOURCE_DIR}/xcursor/
-)
-
-set(MIR_XCURSOR_INCLUDE_DIRECTORIES ${MIR_XCURSOR_INCLUDE_DIRECTORIES} PARENT_SCOPE)

=== modified file '3rd_party/android-input/CMakeLists.txt'
--- 3rd_party/android-input/CMakeLists.txt	2015-02-22 07:46:25 +0000
+++ 3rd_party/android-input/CMakeLists.txt	2015-12-16 17:01:34 +0000
@@ -24,6 +24,6 @@
   ${CMAKE_CURRENT_SOURCE_DIR}/android/hardware/libhardware_legacy/include
   ${CMAKE_CURRENT_SOURCE_DIR}/android/system/core/include
   ${CMAKE_CURRENT_SOURCE_DIR}/android/system/extras/ext4_utils
-  ${CMAKE_CURRENT_SOURCE_DIR}/android/external/kernel-headers/original
+  ${CMAKE_CURRENT_SOURCE_DIR}/android/external/kernel-headers
   )
 set(MIR_ANDROID_INCLUDE_DIRECTORIES ${MIR_ANDROID_INCLUDE_DIRECTORIES} PARENT_SCOPE)

=== modified file '3rd_party/android-input/android/CMakeLists.txt'
--- 3rd_party/android-input/android/CMakeLists.txt	2015-08-19 02:03:51 +0000
+++ 3rd_party/android-input/android/CMakeLists.txt	2015-12-16 17:01:34 +0000
@@ -1,5 +1,5 @@
 include_directories(
-  external/kernel-headers/original
+  external/kernel-headers
   frameworks/base/include
   frameworks/native/include
   hardware/libhardware_legacy/include
@@ -23,30 +23,8 @@
   frameworks/native/libs/utils/Timers.cpp     # used by KeyCharacterMap.cpp, InputReader.cpp, InputDispatcher.cpp, Looper.cpp
 )
 
-add_library(android-input-platform OBJECT
-  frameworks/base/services/input/EventHub.cpp
-  frameworks/base/services/input/InputDevice.cpp
-  frameworks/base/services/input/InputListener.cpp
-  frameworks/base/services/input/InputReader.cpp
-  frameworks/base/services/input/GenericKeyMap.cpp
-  frameworks/base/services/input/Keyboard.cpp
-  frameworks/base/services/input/KeyCharacterMap.cpp
-  frameworks/base/services/input/KeyLayoutMap.cpp
-  frameworks/native/libs/utils/Tokenizer.cpp
-  frameworks/base/services/input/VelocityControl.cpp
-  frameworks/base/services/input/VelocityTracker.cpp
-  frameworks/base/services/input/VirtualKeyMap.cpp
-  frameworks/native/libs/utils/FileMap.cpp
-)
-
 set_target_properties(
   android-input-common
   PROPERTIES
   COMPILE_FLAGS ${ANDROID_INPUT_COMPILE_FLAGS}
 )
-
-set_target_properties(
-  android-input-platform
-  PROPERTIES
-  COMPILE_FLAGS ${ANDROID_INPUT_COMPILE_FLAGS}
-)

=== removed file '3rd_party/android-input/android/frameworks/base/include/androidfw/InputDevice.h'
--- 3rd_party/android-input/android/frameworks/base/include/androidfw/InputDevice.h	2013-05-03 16:38:07 +0000
+++ 3rd_party/android-input/android/frameworks/base/include/androidfw/InputDevice.h	1970-01-01 00:00:00 +0000
@@ -1,156 +0,0 @@
-/*
- * Copyright (C) 2012 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef _ANDROIDFW_INPUT_DEVICE_H
-#define _ANDROIDFW_INPUT_DEVICE_H
-
-
-#include <androidfw/Input.h>
-#include <androidfw/KeyCharacterMap.h>
-
-namespace android {
-
-/*
- * Identifies a device.
- */
-struct InputDeviceIdentifier {
-    inline InputDeviceIdentifier() :
-            bus(0), vendor(0), product(0), version(0) {
-    }
-
-    // Information provided by the kernel.
-    String8 name;
-    String8 location;
-    String8 uniqueId;
-    uint16_t bus;
-    uint16_t vendor;
-    uint16_t product;
-    uint16_t version;
-
-    // A composite input device descriptor string that uniquely identifies the device
-    // even across reboots or reconnections.  The value of this field is used by
-    // upper layers of the input system to associate settings with individual devices.
-    // It is hashed from whatever kernel provided information is available.
-    // 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;
-};
-
-/*
- * Describes the characteristics and capabilities of an input device.
- */
-class InputDeviceInfo {
-public:
-    InputDeviceInfo();
-    InputDeviceInfo(const InputDeviceInfo& other);
-    ~InputDeviceInfo();
-
-    struct MotionRange {
-        int32_t axis;
-        uint32_t source;
-        float min;
-        float max;
-        float flat;
-        float fuzz;
-    };
-
-    void initialize(int32_t id, int32_t generation, const InputDeviceIdentifier& identifier,
-            const String8& alias, bool isExternal);
-
-    inline int32_t getId() const { return mId; }
-    inline int32_t getGeneration() const { return mGeneration; }
-    inline const InputDeviceIdentifier& getIdentifier() const { return mIdentifier; }
-    inline const String8& getAlias() const { return mAlias; }
-    inline const String8& getDisplayName() const {
-        return isEmpty(mAlias) ? mIdentifier.name : mAlias;
-    }
-    inline bool isExternal() const { return mIsExternal; }
-    inline uint32_t getSources() const { return mSources; }
-
-    const MotionRange* getMotionRange(int32_t axis, uint32_t source) const;
-
-    void addSource(uint32_t source);
-    void addMotionRange(int32_t axis, uint32_t source,
-            float min, float max, float flat, float fuzz);
-    void addMotionRange(const MotionRange& range);
-
-    inline void setKeyboardType(int32_t keyboardType) { mKeyboardType = keyboardType; }
-    inline int32_t getKeyboardType() const { return mKeyboardType; }
-
-    inline void setKeyCharacterMap(const sp<KeyCharacterMap>& value) {
-        mKeyCharacterMap = value;
-    }
-
-    inline sp<KeyCharacterMap> getKeyCharacterMap() const {
-        return mKeyCharacterMap;
-    }
-
-    inline void setVibrator(bool hasVibrator) { mHasVibrator = hasVibrator; }
-    inline bool hasVibrator() const { return mHasVibrator; }
-
-    inline const Vector<MotionRange>& getMotionRanges() const {
-        return mMotionRanges;
-    }
-
-private:
-    int32_t mId;
-    int32_t mGeneration;
-    InputDeviceIdentifier mIdentifier;
-    String8 mAlias;
-    bool mIsExternal;
-    uint32_t mSources;
-    int32_t mKeyboardType;
-    sp<KeyCharacterMap> mKeyCharacterMap;
-    bool mHasVibrator;
-
-    Vector<MotionRange> mMotionRanges;
-};
-
-/* Types of input device configuration files. */
-enum InputDeviceConfigurationFileType {
-    INPUT_DEVICE_CONFIGURATION_FILE_TYPE_CONFIGURATION = 0,     /* .idc file */
-    INPUT_DEVICE_CONFIGURATION_FILE_TYPE_KEY_LAYOUT = 1,        /* .kl file */
-    INPUT_DEVICE_CONFIGURATION_FILE_TYPE_KEY_CHARACTER_MAP = 2 /* .kcm file */
-};
-
-/*
- * Gets the path of an input device configuration file, if one is available.
- * Considers both system provided and user installed configuration files.
- *
- * The device identifier is used to construct several default configuration file
- * names to try based on the device name, vendor, product, and version.
- *
- * Returns an empty string if not found.
- */
-extern String8 getInputDeviceConfigurationFilePathByDeviceIdentifier(
-        const InputDeviceIdentifier& deviceIdentifier,
-        InputDeviceConfigurationFileType type);
-
-/*
- * Gets the path of an input device configuration file, if one is available.
- * Considers both system provided and user installed configuration files.
- *
- * The name is case-sensitive and is used to construct the filename to resolve.
- * All characters except 'a'-'z', 'A'-'Z', '0'-'9', '-', and '_' are replaced by underscores.
- *
- * Returns an empty string if not found.
- */
-extern String8 getInputDeviceConfigurationFilePathByName(
-        const String8& name, InputDeviceConfigurationFileType type);
-
-} // namespace android
-
-#endif // _ANDROIDFW_INPUT_DEVICE_H

=== removed file '3rd_party/android-input/android/frameworks/base/include/androidfw/KeyCharacterMap.h'
--- 3rd_party/android-input/android/frameworks/base/include/androidfw/KeyCharacterMap.h	2015-04-28 07:54:10 +0000
+++ 3rd_party/android-input/android/frameworks/base/include/androidfw/KeyCharacterMap.h	1970-01-01 00:00:00 +0000
@@ -1,255 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef _ANDROIDFW_KEY_CHARACTER_MAP_H
-#define _ANDROIDFW_KEY_CHARACTER_MAP_H
-
-
-#include <stdint.h>
-
-#if HAVE_ANDROID_OS
-#include <binder/IBinder.h>
-#endif
-
-#include <androidfw/Input.h>
-#include <std/Errors.h>
-#include <std/KeyedVector.h>
-#include <std/Tokenizer.h>
-#include <std/String8.h>
-#include <std/RefBase.h>
-
-namespace android {
-
-/**
- * Describes a mapping from Android key codes to characters.
- * Also specifies other functions of the keyboard such as the keyboard type
- * and key modifier semantics.
- *
- * This object is immutable after it has been loaded.
- */
-class KeyCharacterMap : public RefBase {
-public:
-    enum KeyboardType {
-        KEYBOARD_TYPE_UNKNOWN = 0,
-        KEYBOARD_TYPE_NUMERIC = 1,
-        KEYBOARD_TYPE_PREDICTIVE = 2,
-        KEYBOARD_TYPE_ALPHA = 3,
-        KEYBOARD_TYPE_FULL = 4,
-        KEYBOARD_TYPE_SPECIAL_FUNCTION = 5,
-        KEYBOARD_TYPE_OVERLAY = 6
-    };
-
-    enum Format {
-        // Base keyboard layout, may contain device-specific options, such as "type" declaration.
-        FORMAT_BASE = 0,
-        // Overlay keyboard layout, more restrictive, may be published by applications,
-        // cannot override device-specific options.
-        FORMAT_OVERLAY = 1,
-        // Either base or overlay layout ok.
-        FORMAT_ANY = 2
-    };
-
-    // Substitute key code and meta state for fallback action.
-    struct FallbackAction {
-        int32_t keyCode;
-        int32_t metaState;
-    };
-
-    /* Loads a key character map from a file. */
-    static status_t load(const String8& filename, Format format, sp<KeyCharacterMap>* outMap);
-
-    /* Loads a key character map from its string contents. */
-    static status_t loadContents(const String8& filename,
-            const char* contents, Format format, sp<KeyCharacterMap>* outMap);
-
-    /* Combines a base key character map and an overlay. */
-    static sp<KeyCharacterMap> combine(const sp<KeyCharacterMap>& base,
-            const sp<KeyCharacterMap>& overlay);
-
-    /* Returns an empty key character map. */
-    static sp<KeyCharacterMap> empty();
-
-    /* Gets the keyboard type. */
-    int32_t getKeyboardType() const;
-
-    /* Gets the primary character for this key as in the label physically printed on it.
-     * Returns 0 if none (eg. for non-printing keys). */
-    char16_t getDisplayLabel(int32_t keyCode) const;
-
-    /* Gets the Unicode character for the number or symbol generated by the key
-     * when the keyboard is used as a dialing pad.
-     * Returns 0 if no number or symbol is generated.
-     */
-    char16_t getNumber(int32_t keyCode) const;
-
-    /* Gets the Unicode character generated by the key and meta key modifiers.
-     * Returns 0 if no character is generated.
-     */
-    char16_t getCharacter(int32_t keyCode, int32_t metaState) const;
-
-    /* Gets the fallback action to use by default if the application does not
-     * handle the specified key.
-     * Returns true if an action was available, false if none.
-     */
-    bool getFallbackAction(int32_t keyCode, int32_t metaState,
-            FallbackAction* outFallbackAction) const;
-
-    /* Gets the first matching Unicode character that can be generated by the key,
-     * preferring the one with the specified meta key modifiers.
-     * Returns 0 if no matching character is generated.
-     */
-    char16_t getMatch(int32_t keyCode, const char16_t* chars,
-            size_t numChars, int32_t metaState) const;
-
-    /* Gets a sequence of key events that could plausibly generate the specified
-     * character sequence.  Returns false if some of the characters cannot be generated.
-     */
-    bool getEvents(int32_t deviceId, const char16_t* chars, size_t numChars,
-            Vector<KeyEvent>& outEvents) const;
-
-    /* Maps a scan code and usage code to a key code, in case this key map overrides
-     * the mapping in some way. */
-    status_t mapKey(int32_t scanCode, int32_t usageCode, int32_t* outKeyCode) const;
-
-#if HAVE_ANDROID_OS
-    /* Reads a key map from a parcel. */
-    static sp<KeyCharacterMap> readFromParcel(Parcel* parcel);
-
-    /* Writes a key map to a parcel. */
-    void writeToParcel(Parcel* parcel) const;
-#endif
-
-protected:
-    virtual ~KeyCharacterMap();
-
-private:
-    struct Behavior {
-        Behavior();
-        Behavior(const Behavior& other);
-
-        /* The next behavior in the list, or NULL if none. */
-        Behavior* next;
-
-        /* The meta key modifiers for this behavior. */
-        int32_t metaState;
-
-        /* The character to insert. */
-        char16_t character;
-
-        /* The fallback keycode if the key is not handled. */
-        int32_t fallbackKeyCode;
-    };
-
-    struct Key {
-        Key();
-        Key(const Key& other);
-        ~Key();
-
-        /* The single character label printed on the key, or 0 if none. */
-        char16_t label;
-
-        /* The number or symbol character generated by the key, or 0 if none. */
-        char16_t number;
-
-        /* The list of key behaviors sorted from most specific to least specific
-         * meta key binding. */
-        Behavior* firstBehavior;
-    };
-
-    class Parser {
-        enum State {
-            STATE_TOP = 0,
-            STATE_KEY = 1
-        };
-
-        enum {
-            PROPERTY_LABEL = 1,
-            PROPERTY_NUMBER = 2,
-            PROPERTY_META = 3
-        };
-
-        struct Property {
-            inline Property(int32_t property = 0, int32_t metaState = 0) :
-                    property(property), metaState(metaState) { }
-
-            int32_t property;
-            int32_t metaState;
-        };
-
-        KeyCharacterMap* mMap;
-        Tokenizer* mTokenizer;
-        Format mFormat;
-        State mState;
-        int32_t mKeyCode;
-
-    public:
-        Parser(KeyCharacterMap* map, Tokenizer* tokenizer, Format format);
-        ~Parser();
-        status_t parse();
-
-    private:
-        status_t parseType();
-        status_t parseMap();
-        status_t parseMapKey();
-        status_t parseKey();
-        status_t parseKeyProperty();
-        status_t finishKey(Key* key);
-        status_t parseModifier(const String8& token, int32_t* outMetaState);
-        status_t parseCharacterLiteral(char16_t* outCharacter);
-    };
-
-    KeyedVector<int32_t, Key*> mKeys;
-    int mType;
-
-    KeyedVector<int32_t, int32_t> mKeysByScanCode;
-    KeyedVector<int32_t, int32_t> mKeysByUsageCode;
-
-    KeyCharacterMap();
-    KeyCharacterMap(const KeyCharacterMap& other);
-
-    bool getKey(int32_t keyCode, const Key** outKey) const;
-    bool getKeyBehavior(int32_t keyCode, int32_t metaState,
-            const Key** outKey, const Behavior** outBehavior) const;
-    static bool matchesMetaState(int32_t eventMetaState, int32_t behaviorMetaState);
-
-    bool findKey(char16_t ch, int32_t* outKeyCode, int32_t* outMetaState) const;
-
-    static status_t load(Tokenizer* tokenizer, Format format, sp<KeyCharacterMap>* outMap);
-
-    static void addKey(Vector<KeyEvent>& outEvents,
-            int32_t deviceId, int32_t keyCode, int32_t metaState, bool down, std::chrono::nanoseconds time);
-    static void addMetaKeys(Vector<KeyEvent>& outEvents,
-            int32_t deviceId, int32_t metaState, bool down, std::chrono::nanoseconds time,
-            int32_t* currentMetaState);
-    static bool addSingleEphemeralMetaKey(Vector<KeyEvent>& outEvents,
-            int32_t deviceId, int32_t metaState, bool down, std::chrono::nanoseconds time,
-            int32_t keyCode, int32_t keyMetaState,
-            int32_t* currentMetaState);
-    static void addDoubleEphemeralMetaKey(Vector<KeyEvent>& outEvents,
-            int32_t deviceId, int32_t metaState, bool down, std::chrono::nanoseconds time,
-            int32_t leftKeyCode, int32_t leftKeyMetaState,
-            int32_t rightKeyCode, int32_t rightKeyMetaState,
-            int32_t eitherKeyMetaState,
-            int32_t* currentMetaState);
-    static void addLockedMetaKey(Vector<KeyEvent>& outEvents,
-            int32_t deviceId, int32_t metaState, std::chrono::nanoseconds time,
-            int32_t keyCode, int32_t keyMetaState,
-            int32_t* currentMetaState);
-};
-
-} // namespace android
-
-#endif // _ANDROIDFW_KEY_CHARACTER_MAP_H

=== removed file '3rd_party/android-input/android/frameworks/base/include/androidfw/KeyLayoutMap.h'
--- 3rd_party/android-input/android/frameworks/base/include/androidfw/KeyLayoutMap.h	2013-05-03 16:38:07 +0000
+++ 3rd_party/android-input/android/frameworks/base/include/androidfw/KeyLayoutMap.h	1970-01-01 00:00:00 +0000
@@ -1,114 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef _ANDROIDFW_KEY_LAYOUT_MAP_H
-#define _ANDROIDFW_KEY_LAYOUT_MAP_H
-
-
-#include <stdint.h>
-#include <std/Errors.h>
-#include <std/KeyedVector.h>
-#include <std/Tokenizer.h>
-#include <std/RefBase.h>
-
-namespace android {
-
-struct AxisInfo {
-    enum Mode {
-        // Axis value is reported directly.
-        MODE_NORMAL = 0,
-        // Axis value should be inverted before reporting.
-        MODE_INVERT = 1,
-        // Axis value should be split into two axes
-        MODE_SPLIT = 2
-    };
-
-    // Axis mode.
-    Mode mode;
-
-    // Axis id.
-    // When split, this is the axis used for values smaller than the split position.
-    int32_t axis;
-
-    // When split, this is the axis used for values after higher than the split position.
-    int32_t highAxis;
-
-    // The split value, or 0 if not split.
-    int32_t splitValue;
-
-    // The flat value, or -1 if none.
-    int32_t flatOverride;
-
-    AxisInfo() : mode(MODE_NORMAL), axis(-1), highAxis(-1), splitValue(0), flatOverride(-1) {
-    }
-};
-
-/**
- * Describes a mapping from keyboard scan codes and joystick axes to Android key codes and axes.
- *
- * This object is immutable after it has been loaded.
- */
-class KeyLayoutMap : public RefBase {
-public:
-    static status_t load(const String8& filename, sp<KeyLayoutMap>* outMap);
-    // <mir changes>
-    static status_t load(const String8& filename, const char* contents, sp<KeyLayoutMap>* outMap);
-    // </mir changes>
-
-    status_t mapKey(int32_t scanCode, int32_t usageCode,
-            int32_t* outKeyCode, uint32_t* outFlags) const;
-    status_t findScanCodesForKey(int32_t keyCode, Vector<int32_t>* outScanCodes) const;
-
-    status_t mapAxis(int32_t scanCode, AxisInfo* outAxisInfo) const;
-
-protected:
-    virtual ~KeyLayoutMap();
-
-private:
-    // <mir changes>
-    static status_t load(Tokenizer* tokenizer, sp<KeyLayoutMap>* outMap);
-    // </mir changes>
-    struct Key {
-        int32_t keyCode;
-        uint32_t flags;
-    };
-
-    KeyedVector<int32_t, Key> mKeysByScanCode;
-    KeyedVector<int32_t, Key> mKeysByUsageCode;
-    KeyedVector<int32_t, AxisInfo> mAxes;
-
-    KeyLayoutMap();
-
-    const Key* getKey(int32_t scanCode, int32_t usageCode) const;
-
-    class Parser {
-        KeyLayoutMap* mMap;
-        Tokenizer* mTokenizer;
-
-    public:
-        Parser(KeyLayoutMap* map, Tokenizer* tokenizer);
-        ~Parser();
-        status_t parse();
-
-    private:
-        status_t parseKey();
-        status_t parseAxis();
-    };
-};
-
-} // namespace android
-
-#endif // _ANDROIDFW_KEY_LAYOUT_MAP_H

=== removed file '3rd_party/android-input/android/frameworks/base/include/androidfw/Keyboard.h'
--- 3rd_party/android-input/android/frameworks/base/include/androidfw/Keyboard.h	2013-05-03 16:38:07 +0000
+++ 3rd_party/android-input/android/frameworks/base/include/androidfw/Keyboard.h	1970-01-01 00:00:00 +0000
@@ -1,125 +0,0 @@
-/*
- * Copyright (C) 2010 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef _ANDROIDFW_KEYBOARD_H
-#define _ANDROIDFW_KEYBOARD_H
-
-
-#include <androidfw/Input.h>
-#include <androidfw/InputDevice.h>
-#include <std/Errors.h>
-#include <std/String8.h>
-#include <std/PropertyMap.h>
-
-namespace android {
-
-enum {
-    /* Device id of the built in keyboard. */
-    DEVICE_ID_BUILT_IN_KEYBOARD = 0,
-
-    /* Device id of a generic virtual keyboard with a full layout that can be used
-     * to synthesize key events. */
-    DEVICE_ID_VIRTUAL_KEYBOARD = -1
-};
-
-class KeyLayoutMap;
-class KeyCharacterMap;
-
-/**
- * Loads the key layout map and key character map for a keyboard device.
- */
-class KeyMap {
-public:
-    String8 keyLayoutFile;
-    sp<KeyLayoutMap> keyLayoutMap;
-
-    String8 keyCharacterMapFile;
-    sp<KeyCharacterMap> keyCharacterMap;
-
-    KeyMap();
-    ~KeyMap();
-
-    status_t load(const InputDeviceIdentifier& deviceIdenfier,
-            const PropertyMap* deviceConfiguration);
-
-    // <mir changes>
-    status_t loadGenericMaps();
-    // </mir changes>
-
-    inline bool haveKeyLayout() const {
-        return !isEmpty(keyLayoutFile);
-    }
-
-    inline bool haveKeyCharacterMap() const {
-        return !isEmpty(keyCharacterMapFile);
-    }
-
-    inline bool isComplete() const {
-        return haveKeyLayout() && haveKeyCharacterMap();
-    }
-
-private:
-    bool probeKeyMap(const InputDeviceIdentifier& deviceIdentifier, const String8& name);
-    status_t loadKeyLayout(const InputDeviceIdentifier& deviceIdentifier, const String8& name);
-    status_t loadKeyCharacterMap(const InputDeviceIdentifier& deviceIdentifier,
-            const String8& name);
-    String8 getPath(const InputDeviceIdentifier& deviceIdentifier,
-            const String8& name, InputDeviceConfigurationFileType type);
-};
-
-/**
- * Returns true if the keyboard is eligible for use as a built-in keyboard.
- */
-extern bool isEligibleBuiltInKeyboard(const InputDeviceIdentifier& deviceIdentifier,
-        const PropertyMap* deviceConfiguration, const KeyMap* keyMap);
-
-/**
- * Gets a key code by its short form label, eg. "HOME".
- * Returns 0 if unknown.
- */
-extern int32_t getKeyCodeByLabel(const char* label);
-
-/**
- * Gets a key flag by its short form label, eg. "WAKE".
- * Returns 0 if unknown.
- */
-extern uint32_t getKeyFlagByLabel(const char* label);
-
-/**
- * Gets a axis by its short form label, eg. "X".
- * Returns -1 if unknown.
- */
-extern int32_t getAxisByLabel(const char* label);
-
-/**
- * Gets a axis label by its id.
- * Returns NULL if unknown.
- */
-extern const char* getAxisLabel(int32_t axisId);
-
-/**
- * Updates a meta state field when a key is pressed or released.
- */
-extern int32_t updateMetaState(int32_t keyCode, bool down, int32_t oldMetaState);
-
-/**
- * Returns true if a key is a meta key like ALT or CAPS_LOCK.
- */
-extern bool isMetaKey(int32_t keyCode);
-
-} // namespace android
-
-#endif // _ANDROIDFW_KEYBOARD_H

=== removed file '3rd_party/android-input/android/frameworks/base/include/androidfw/KeycodeLabels.h'
--- 3rd_party/android-input/android/frameworks/base/include/androidfw/KeycodeLabels.h	2013-05-03 16:38:07 +0000
+++ 3rd_party/android-input/android/frameworks/base/include/androidfw/KeycodeLabels.h	1970-01-01 00:00:00 +0000
@@ -1,320 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef _ANDROIDFW_KEYCODE_LABELS_H
-#define _ANDROIDFW_KEYCODE_LABELS_H
-
-
-#include <android/keycodes.h>
-
-struct KeycodeLabel {
-    const char *literal;
-    int value;
-};
-
-static const KeycodeLabel KEYCODES[] = {
-    { "SOFT_LEFT", 1 },
-    { "SOFT_RIGHT", 2 },
-    { "HOME", 3 },
-    { "BACK", 4 },
-    { "CALL", 5 },
-    { "ENDCALL", 6 },
-    { "0", 7 },
-    { "1", 8 },
-    { "2", 9 },
-    { "3", 10 },
-    { "4", 11 },
-    { "5", 12 },
-    { "6", 13 },
-    { "7", 14 },
-    { "8", 15 },
-    { "9", 16 },
-    { "STAR", 17 },
-    { "POUND", 18 },
-    { "DPAD_UP", 19 },
-    { "DPAD_DOWN", 20 },
-    { "DPAD_LEFT", 21 },
-    { "DPAD_RIGHT", 22 },
-    { "DPAD_CENTER", 23 },
-    { "VOLUME_UP", 24 },
-    { "VOLUME_DOWN", 25 },
-    { "POWER", 26 },
-    { "CAMERA", 27 },
-    { "CLEAR", 28 },
-    { "A", 29 },
-    { "B", 30 },
-    { "C", 31 },
-    { "D", 32 },
-    { "E", 33 },
-    { "F", 34 },
-    { "G", 35 },
-    { "H", 36 },
-    { "I", 37 },
-    { "J", 38 },
-    { "K", 39 },
-    { "L", 40 },
-    { "M", 41 },
-    { "N", 42 },
-    { "O", 43 },
-    { "P", 44 },
-    { "Q", 45 },
-    { "R", 46 },
-    { "S", 47 },
-    { "T", 48 },
-    { "U", 49 },
-    { "V", 50 },
-    { "W", 51 },
-    { "X", 52 },
-    { "Y", 53 },
-    { "Z", 54 },
-    { "COMMA", 55 },
-    { "PERIOD", 56 },
-    { "ALT_LEFT", 57 },
-    { "ALT_RIGHT", 58 },
-    { "SHIFT_LEFT", 59 },
-    { "SHIFT_RIGHT", 60 },
-    { "TAB", 61 },
-    { "SPACE", 62 },
-    { "SYM", 63 },
-    { "EXPLORER", 64 },
-    { "ENVELOPE", 65 },
-    { "ENTER", 66 },
-    { "DEL", 67 },
-    { "GRAVE", 68 },
-    { "MINUS", 69 },
-    { "EQUALS", 70 },
-    { "LEFT_BRACKET", 71 },
-    { "RIGHT_BRACKET", 72 },
-    { "BACKSLASH", 73 },
-    { "SEMICOLON", 74 },
-    { "APOSTROPHE", 75 },
-    { "SLASH", 76 },
-    { "AT", 77 },
-    { "NUM", 78 },
-    { "HEADSETHOOK", 79 },
-    { "FOCUS", 80 },
-    { "PLUS", 81 },
-    { "MENU", 82 },
-    { "NOTIFICATION", 83 },
-    { "SEARCH", 84 },
-    { "MEDIA_PLAY_PAUSE", 85 },
-    { "MEDIA_STOP", 86 },
-    { "MEDIA_NEXT", 87 },
-    { "MEDIA_PREVIOUS", 88 },
-    { "MEDIA_REWIND", 89 },
-    { "MEDIA_FAST_FORWARD", 90 },
-    { "MUTE", 91 },
-    { "PAGE_UP", 92 },
-    { "PAGE_DOWN", 93 },
-    { "PICTSYMBOLS", 94 },
-    { "SWITCH_CHARSET", 95 },
-    { "BUTTON_A", 96 },
-    { "BUTTON_B", 97 },
-    { "BUTTON_C", 98 },
-    { "BUTTON_X", 99 },
-    { "BUTTON_Y", 100 },
-    { "BUTTON_Z", 101 },
-    { "BUTTON_L1", 102 },
-    { "BUTTON_R1", 103 },
-    { "BUTTON_L2", 104 },
-    { "BUTTON_R2", 105 },
-    { "BUTTON_THUMBL", 106 },
-    { "BUTTON_THUMBR", 107 },
-    { "BUTTON_START", 108 },
-    { "BUTTON_SELECT", 109 },
-    { "BUTTON_MODE", 110 },
-    { "ESCAPE", 111 },
-    { "FORWARD_DEL", 112 },
-    { "CTRL_LEFT", 113 },
-    { "CTRL_RIGHT", 114 },
-    { "CAPS_LOCK", 115 },
-    { "SCROLL_LOCK", 116 },
-    { "META_LEFT", 117 },
-    { "META_RIGHT", 118 },
-    { "FUNCTION", 119 },
-    { "SYSRQ", 120 },
-    { "BREAK", 121 },
-    { "MOVE_HOME", 122 },
-    { "MOVE_END", 123 },
-    { "INSERT", 124 },
-    { "FORWARD", 125 },
-    { "MEDIA_PLAY", 126 },
-    { "MEDIA_PAUSE", 127 },
-    { "MEDIA_CLOSE", 128 },
-    { "MEDIA_EJECT", 129 },
-    { "MEDIA_RECORD", 130 },
-    { "F1", 131 },
-    { "F2", 132 },
-    { "F3", 133 },
-    { "F4", 134 },
-    { "F5", 135 },
-    { "F6", 136 },
-    { "F7", 137 },
-    { "F8", 138 },
-    { "F9", 139 },
-    { "F10", 140 },
-    { "F11", 141 },
-    { "F12", 142 },
-    { "NUM_LOCK", 143 },
-    { "NUMPAD_0", 144 },
-    { "NUMPAD_1", 145 },
-    { "NUMPAD_2", 146 },
-    { "NUMPAD_3", 147 },
-    { "NUMPAD_4", 148 },
-    { "NUMPAD_5", 149 },
-    { "NUMPAD_6", 150 },
-    { "NUMPAD_7", 151 },
-    { "NUMPAD_8", 152 },
-    { "NUMPAD_9", 153 },
-    { "NUMPAD_DIVIDE", 154 },
-    { "NUMPAD_MULTIPLY", 155 },
-    { "NUMPAD_SUBTRACT", 156 },
-    { "NUMPAD_ADD", 157 },
-    { "NUMPAD_DOT", 158 },
-    { "NUMPAD_COMMA", 159 },
-    { "NUMPAD_ENTER", 160 },
-    { "NUMPAD_EQUALS", 161 },
-    { "NUMPAD_LEFT_PAREN", 162 },
-    { "NUMPAD_RIGHT_PAREN", 163 },
-    { "VOLUME_MUTE", 164 },
-    { "INFO", 165 },
-    { "CHANNEL_UP", 166 },
-    { "CHANNEL_DOWN", 167 },
-    { "ZOOM_IN", 168 },
-    { "ZOOM_OUT", 169 },
-    { "TV", 170 },
-    { "WINDOW", 171 },
-    { "GUIDE", 172 },
-    { "DVR", 173 },
-    { "BOOKMARK", 174 },
-    { "CAPTIONS", 175 },
-    { "SETTINGS", 176 },
-    { "TV_POWER", 177 },
-    { "TV_INPUT", 178 },
-    { "STB_POWER", 179 },
-    { "STB_INPUT", 180 },
-    { "AVR_POWER", 181 },
-    { "AVR_INPUT", 182 },
-    { "PROG_RED", 183 },
-    { "PROG_GREEN", 184 },
-    { "PROG_YELLOW", 185 },
-    { "PROG_BLUE", 186 },
-    { "APP_SWITCH", 187 },
-    { "BUTTON_1", 188 },
-    { "BUTTON_2", 189 },
-    { "BUTTON_3", 190 },
-    { "BUTTON_4", 191 },
-    { "BUTTON_5", 192 },
-    { "BUTTON_6", 193 },
-    { "BUTTON_7", 194 },
-    { "BUTTON_8", 195 },
-    { "BUTTON_9", 196 },
-    { "BUTTON_10", 197 },
-    { "BUTTON_11", 198 },
-    { "BUTTON_12", 199 },
-    { "BUTTON_13", 200 },
-    { "BUTTON_14", 201 },
-    { "BUTTON_15", 202 },
-    { "BUTTON_16", 203 },
-    { "LANGUAGE_SWITCH", 204 },
-    { "MANNER_MODE", 205 },
-    { "3D_MODE", 206 },
-    { "CONTACTS", 207 },
-    { "CALENDAR", 208 },
-    { "MUSIC", 209 },
-    { "CALCULATOR", 210 },
-    { "ZENKAKU_HANKAKU", 211 },
-    { "EISU", 212 },
-    { "MUHENKAN", 213 },
-    { "HENKAN", 214 },
-    { "KATAKANA_HIRAGANA", 215 },
-    { "YEN", 216 },
-    { "RO", 217 },
-    { "KANA", 218 },
-    { "ASSIST", 219 },
-
-    // NOTE: If you add a new keycode here you must also add it to several other files.
-    //       Refer to frameworks/base/core/java/android/view/KeyEvent.java for the full list.
-
-    { NULL, 0 }
-};
-
-// NOTE: If you edit these flags, also edit policy flags in Input.h.
-static const KeycodeLabel FLAGS[] = {
-    { "WAKE", 0x00000001 },
-    { "WAKE_DROPPED", 0x00000002 },
-    { "SHIFT", 0x00000004 },
-    { "CAPS_LOCK", 0x00000008 },
-    { "ALT", 0x00000010 },
-    { "ALT_GR", 0x00000020 },
-    { "MENU", 0x00000040 },
-    { "LAUNCHER", 0x00000080 },
-    { "VIRTUAL", 0x00000100 },
-    { "FUNCTION", 0x00000200 },
-    { NULL, 0 }
-};
-
-static const KeycodeLabel AXES[] = {
-    { "X", 0 },
-    { "Y", 1 },
-    { "PRESSURE", 2 },
-    { "SIZE", 3 },
-    { "TOUCH_MAJOR", 4 },
-    { "TOUCH_MINOR", 5 },
-    { "TOOL_MAJOR", 6 },
-    { "TOOL_MINOR", 7 },
-    { "ORIENTATION", 8 },
-    { "VSCROLL", 9 },
-    { "HSCROLL", 10 },
-    { "Z", 11 },
-    { "RX", 12 },
-    { "RY", 13 },
-    { "RZ", 14 },
-    { "HAT_X", 15 },
-    { "HAT_Y", 16 },
-    { "LTRIGGER", 17 },
-    { "RTRIGGER", 18 },
-    { "THROTTLE", 19 },
-    { "RUDDER", 20 },
-    { "WHEEL", 21 },
-    { "GAS", 22 },
-    { "BRAKE", 23 },
-    { "DISTANCE", 24 },
-    { "TILT", 25 },
-    { "GENERIC_1", 32 },
-    { "GENERIC_2", 33 },
-    { "GENERIC_3", 34 },
-    { "GENERIC_4", 35 },
-    { "GENERIC_5", 36 },
-    { "GENERIC_6", 37 },
-    { "GENERIC_7", 38 },
-    { "GENERIC_8", 39 },
-    { "GENERIC_9", 40 },
-    { "GENERIC_10", 41 },
-    { "GENERIC_11", 42 },
-    { "GENERIC_12", 43 },
-    { "GENERIC_13", 44 },
-    { "GENERIC_14", 45 },
-    { "GENERIC_15", 46 },
-    { "GENERIC_16", 47 },
-
-    // NOTE: If you add a new axis here you must also add it to several other files.
-    //       Refer to frameworks/base/core/java/android/view/MotionEvent.java for the full list.
-
-    { NULL, -1 }
-};
-
-#endif // _ANDROIDFW_KEYCODE_LABELS_H

=== removed file '3rd_party/android-input/android/frameworks/base/include/androidfw/VelocityControl.h'
--- 3rd_party/android-input/android/frameworks/base/include/androidfw/VelocityControl.h	2015-04-28 07:54:10 +0000
+++ 3rd_party/android-input/android/frameworks/base/include/androidfw/VelocityControl.h	1970-01-01 00:00:00 +0000
@@ -1,110 +0,0 @@
-/*
- * Copyright (C) 2012 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef _ANDROIDFW_VELOCITY_CONTROL_H
-#define _ANDROIDFW_VELOCITY_CONTROL_H
-
-
-#include <androidfw/Input.h>
-#include <androidfw/IntSet.h>
-#include <androidfw/VelocityTracker.h>
-#include <std/Timers.h>
-
-namespace android {
-
-/*
- * Specifies parameters that govern pointer or wheel acceleration.
- */
-struct VelocityControlParameters {
-    // A scale factor that is multiplied with the raw velocity deltas
-    // prior to applying any other velocity control factors.  The scale
-    // factor should be used to adapt the input device resolution
-    // (eg. counts per inch) to the output device resolution (eg. pixels per inch).
-    //
-    // Must be a positive value.
-    // Default is 1.0 (no scaling).
-    float scale;
-
-    // The scaled speed at which acceleration begins to be applied.
-    // This value establishes the upper bound of a low speed regime for
-    // small precise motions that are performed without any acceleration.
-    //
-    // Must be a non-negative value.
-    // Default is 0.0 (no low threshold).
-    float lowThreshold;
-
-    // The scaled speed at which maximum acceleration is applied.
-    // The difference between highThreshold and lowThreshold controls
-    // the range of speeds over which the acceleration factor is interpolated.
-    // The wider the range, the smoother the acceleration.
-    //
-    // Must be a non-negative value greater than or equal to lowThreshold.
-    // Default is 0.0 (no high threshold).
-    float highThreshold;
-
-    // The acceleration factor.
-    // When the speed is above the low speed threshold, the velocity will scaled
-    // by an interpolated value between 1.0 and this amount.
-    //
-    // Must be a positive greater than or equal to 1.0.
-    // Default is 1.0 (no acceleration).
-    float acceleration;
-
-    VelocityControlParameters() :
-            scale(1.0f), lowThreshold(0.0f), highThreshold(0.0f), acceleration(1.0f) {
-    }
-
-    VelocityControlParameters(float scale, float lowThreshold,
-            float highThreshold, float acceleration) :
-            scale(scale), lowThreshold(lowThreshold),
-            highThreshold(highThreshold), acceleration(acceleration) {
-    }
-};
-
-/*
- * Implements mouse pointer and wheel speed control and acceleration.
- */
-class VelocityControl {
-public:
-    VelocityControl();
-
-    /* Sets the various parameters. */
-    void setParameters(const VelocityControlParameters& parameters);
-
-    /* Resets the current movement counters to zero.
-     * This has the effect of nullifying any acceleration. */
-    void reset();
-
-    /* Translates a raw movement delta into an appropriately
-     * scaled / accelerated delta based on the current velocity. */
-    void move(std::chrono::nanoseconds eventTime, float* deltaX, float* deltaY);
-
-private:
-    // If no movements are received within this amount of time,
-    // we assume the movement has stopped and reset the movement counters.
-    static constexpr const std::chrono::nanoseconds STOP_TIME = std::chrono::nanoseconds(500 * 1000000); // 500 ms
-
-    VelocityControlParameters mParameters;
-
-    std::chrono::nanoseconds mLastMovementTime;
-    VelocityTracker::Position mRawPosition;
-    VelocityTracker mVelocityTracker;
-    IntSet mIds;
-};
-
-} // namespace android
-
-#endif // _ANDROIDFW_VELOCITY_CONTROL_H

=== removed file '3rd_party/android-input/android/frameworks/base/include/androidfw/VelocityTracker.h'
--- 3rd_party/android-input/android/frameworks/base/include/androidfw/VelocityTracker.h	2015-04-28 07:54:10 +0000
+++ 3rd_party/android-input/android/frameworks/base/include/androidfw/VelocityTracker.h	1970-01-01 00:00:00 +0000
@@ -1,272 +0,0 @@
-/*
- * Copyright (C) 2012 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef _ANDROIDFW_VELOCITY_TRACKER_H
-#define _ANDROIDFW_VELOCITY_TRACKER_H
-
-#include <androidfw/Input.h>
-#include <androidfw/IntSet.h>
-#include <std/Timers.h>
-
-// C++ std lib
-#include <unordered_map>
-
-namespace android {
-
-class VelocityTrackerStrategy;
-
-/*
- * Calculates the velocity of pointer movements over time.
- */
-class VelocityTracker {
-public:
-    struct Position {
-        float x, y;
-    };
-
-    struct Estimator {
-        static const size_t MAX_DEGREE = 4;
-
-        // Estimator time base.
-        std::chrono::nanoseconds time;
-
-        // Polynomial coefficients describing motion in X and Y.
-        float xCoeff[MAX_DEGREE + 1], yCoeff[MAX_DEGREE + 1];
-
-        // Polynomial degree (number of coefficients), or zero if no information is
-        // available.
-        uint32_t degree;
-
-        // Confidence (coefficient of determination), between 0 (no fit) and 1 (perfect fit).
-        float confidence;
-
-        inline void clear() {
-            time = std::chrono::nanoseconds(0);
-            degree = 0;
-            confidence = 0;
-            for (size_t i = 0; i <= MAX_DEGREE; i++) {
-                xCoeff[i] = 0;
-                yCoeff[i] = 0;
-            }
-        }
-    };
-
-    // Creates a velocity tracker using the specified strategy.
-    // If strategy is NULL, uses the default strategy for the platform.
-    VelocityTracker(const char* strategy = NULL);
-
-    ~VelocityTracker();
-
-    // Resets the velocity tracker state.
-    void clear();
-
-    // Resets the velocity tracker state for specific pointers.
-    // Call this method when some pointers have changed and may be reusing
-    // an id that was assigned to a different pointer earlier.
-    void clearPointers(const IntSet &ids);
-
-    // Adds movement information for a set of pointers.
-    // The ids set specifies the pointer ids of the pointers whose positions
-    // are included in the movement.
-    // The positions array contains position information for each pointer in order by
-    // increasing id.  Its size should be equal to the size of ids.
-    void addMovement(std::chrono::nanoseconds eventTime, const IntSet &ids, const Position* positions);
-
-    // Adds movement information for all pointers in a MotionEvent, including historical samples.
-    void addMovement(const MotionEvent* event);
-
-    // Gets the velocity of the specified pointer id in position units per second.
-    // Returns false and sets the velocity components to zero if there is
-    // insufficient movement information for the pointer.
-    bool getVelocity(uint32_t id, float* outVx, float* outVy) const;
-
-    // Gets an estimator for the recent movements of the specified pointer id.
-    // Returns false and clears the estimator if there is no information available
-    // about the pointer.
-    bool getEstimator(uint32_t id, Estimator* outEstimator) const;
-
-    // Gets the active pointer id, or -1 if none.
-    inline int32_t getActivePointerId() const { return mActivePointerId; }
-
-    // Gets a bitset containing all pointer ids from the most recent movement.
-    inline const IntSet &getCurrentPointerIds() const { return mCurrentPointerIds; }
-
-private:
-    static const char* DEFAULT_STRATEGY;
-
-    std::chrono::nanoseconds mLastEventTime;
-    IntSet mCurrentPointerIds;
-    int32_t mActivePointerId;
-    VelocityTrackerStrategy* mStrategy;
-
-    bool configureStrategy(const char* strategy);
-
-    static VelocityTrackerStrategy* createStrategy(const char* strategy);
-};
-
-
-/*
- * Implements a particular velocity tracker algorithm.
- */
-class VelocityTrackerStrategy {
-protected:
-    VelocityTrackerStrategy() { }
-
-public:
-    virtual ~VelocityTrackerStrategy() { }
-
-    virtual void clear() = 0;
-    virtual void clearPointers(const IntSet &ids) = 0;
-    virtual void addMovement(std::chrono::nanoseconds eventTime, const IntSet &ids,
-            const VelocityTracker::Position* positions) = 0;
-    virtual bool getEstimator(uint32_t id, VelocityTracker::Estimator* outEstimator) const = 0;
-};
-
-
-/*
- * Velocity tracker algorithm based on least-squares linear regression.
- */
-class LeastSquaresVelocityTrackerStrategy : public VelocityTrackerStrategy {
-public:
-    enum Weighting {
-        // No weights applied.  All data points are equally reliable.
-        WEIGHTING_NONE,
-
-        // Weight by time delta.  Data points clustered together are weighted less.
-        WEIGHTING_DELTA,
-
-        // Weight such that points within a certain horizon are weighed more than those
-        // outside of that horizon.
-        WEIGHTING_CENTRAL,
-
-        // Weight such that points older than a certain amount are weighed less.
-        WEIGHTING_RECENT
-    };
-
-    // Degree must be no greater than Estimator::MAX_DEGREE.
-    LeastSquaresVelocityTrackerStrategy(uint32_t degree, Weighting weighting = WEIGHTING_NONE);
-    virtual ~LeastSquaresVelocityTrackerStrategy();
-
-    virtual void clear();
-    virtual void clearPointers(const IntSet &ids);
-    virtual void addMovement(std::chrono::nanoseconds eventTime, const IntSet &ids,
-            const VelocityTracker::Position* positions);
-    virtual bool getEstimator(uint32_t id, VelocityTracker::Estimator* outEstimator) const;
-
-private:
-    // Sample horizon.
-    // We don't use too much history by default since we want to react to quick
-    // changes in direction.
-    static constexpr const std::chrono::nanoseconds HORIZON = std::chrono::nanoseconds(100 * 1000000); // 100 ms
-
-    // Number of samples to keep.
-    static const uint32_t HISTORY_SIZE = 20;
-
-    struct Movement {
-        std::chrono::nanoseconds eventTime;
-        IntSet ids;
-        VelocityTracker::Position positions[MAX_POINTERS];
-
-        inline const VelocityTracker::Position& getPosition(uint32_t id) const {
-            return positions[ids.indexOf(id)];
-        }
-    };
-
-    float chooseWeight(uint32_t index) const;
-
-    const uint32_t mDegree;
-    const Weighting mWeighting;
-    uint32_t mIndex;
-    Movement mMovements[HISTORY_SIZE];
-};
-
-
-/*
- * Velocity tracker algorithm that uses an IIR filter.
- */
-class IntegratingVelocityTrackerStrategy : public VelocityTrackerStrategy {
-public:
-    // Degree must be 1 or 2.
-    IntegratingVelocityTrackerStrategy(uint32_t degree);
-    ~IntegratingVelocityTrackerStrategy();
-
-    virtual void clear();
-    virtual void clearPointers(const IntSet &ids);
-    virtual void addMovement(std::chrono::nanoseconds eventTime, const IntSet &ids,
-            const VelocityTracker::Position* positions);
-    virtual bool getEstimator(uint32_t id, VelocityTracker::Estimator* outEstimator) const;
-
-private:
-    // Current state estimate for a particular pointer.
-    struct State {
-        std::chrono::nanoseconds updateTime;
-        uint32_t degree;
-
-        float xpos, xvel, xaccel;
-        float ypos, yvel, yaccel;
-    };
-
-    const uint32_t mDegree;
-    IntSet mPointerIds;
-    std::unordered_map<int32_t, State> mPointerState; // maps the id of a pointer to its state
-
-    void initState(State& state, std::chrono::nanoseconds eventTime, float xpos, float ypos) const;
-    void updateState(State& state, std::chrono::nanoseconds eventTime, float xpos, float ypos) const;
-    void populateEstimator(const State& state, VelocityTracker::Estimator* outEstimator) const;
-};
-
-
-/*
- * Velocity tracker strategy used prior to ICS.
- */
-class LegacyVelocityTrackerStrategy : public VelocityTrackerStrategy {
-public:
-    LegacyVelocityTrackerStrategy();
-    virtual ~LegacyVelocityTrackerStrategy();
-
-    virtual void clear();
-    virtual void clearPointers(const IntSet &ids);
-    virtual void addMovement(std::chrono::nanoseconds eventTime, const IntSet &ids,
-            const VelocityTracker::Position* positions);
-    virtual bool getEstimator(uint32_t id, VelocityTracker::Estimator* outEstimator) const;
-
-private:
-    // Oldest sample to consider when calculating the velocity.
-    static constexpr const std::chrono::nanoseconds HORIZON = std::chrono::nanoseconds(200 * 1000000); // 100 ms
-
-    // Number of samples to keep.
-    static const uint32_t HISTORY_SIZE = 20;
-
-    // The minimum duration between samples when estimating velocity.
-    static constexpr const std::chrono::nanoseconds MIN_DURATION = std::chrono::nanoseconds(10 * 1000000); // 10 ms
-
-    struct Movement {
-        std::chrono::nanoseconds eventTime;
-        IntSet ids;
-        VelocityTracker::Position positions[MAX_POINTERS];
-
-        inline const VelocityTracker::Position& getPosition(uint32_t id) const {
-            return positions[ids.indexOf(id)];
-        }
-    };
-
-    uint32_t mIndex;
-    Movement mMovements[HISTORY_SIZE];
-};
-
-} // namespace android
-
-#endif // _ANDROIDFW_VELOCITY_TRACKER_H

=== removed file '3rd_party/android-input/android/frameworks/base/include/androidfw/VirtualKeyMap.h'
--- 3rd_party/android-input/android/frameworks/base/include/androidfw/VirtualKeyMap.h	2013-05-03 16:38:07 +0000
+++ 3rd_party/android-input/android/frameworks/base/include/androidfw/VirtualKeyMap.h	1970-01-01 00:00:00 +0000
@@ -1,81 +0,0 @@
-/*
- * Copyright (C) 2010 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef _ANDROIDFW_VIRTUAL_KEY_MAP_H
-#define _ANDROIDFW_VIRTUAL_KEY_MAP_H
-
-
-#include <stdint.h>
-
-#include <androidfw/Input.h>
-#include <std/Errors.h>
-#include <std/KeyedVector.h>
-#include <std/Tokenizer.h>
-#include <std/String8.h>
-
-namespace android {
-
-/* Describes a virtual key. */
-struct VirtualKeyDefinition {
-    int32_t scanCode;
-
-    // configured position data, specified in display coords
-    int32_t centerX;
-    int32_t centerY;
-    int32_t width;
-    int32_t height;
-};
-
-
-/**
- * Describes a collection of virtual keys on a touch screen in terms of
- * virtual scan codes and hit rectangles.
- *
- * This object is immutable after it has been loaded.
- */
-class VirtualKeyMap {
-public:
-    ~VirtualKeyMap();
-
-    static status_t load(const String8& filename, VirtualKeyMap** outMap);
-
-    inline const Vector<VirtualKeyDefinition>& getVirtualKeys() const {
-        return mVirtualKeys;
-    }
-
-private:
-    class Parser {
-        VirtualKeyMap* mMap;
-        Tokenizer* mTokenizer;
-
-    public:
-        Parser(VirtualKeyMap* map, Tokenizer* tokenizer);
-        ~Parser();
-        status_t parse();
-
-    private:
-        bool consumeFieldDelimiterAndSkipWhitespace();
-        bool parseNextIntField(int32_t* outValue);
-    };
-
-    Vector<VirtualKeyDefinition> mVirtualKeys;
-
-    VirtualKeyMap();
-};
-
-} // namespace android
-
-#endif // _ANDROIDFW_KEY_CHARACTER_MAP_H

=== removed file '3rd_party/android-input/android/frameworks/base/services/input/EventHub.cpp'
--- 3rd_party/android-input/android/frameworks/base/services/input/EventHub.cpp	2015-08-19 02:03:51 +0000
+++ 3rd_party/android-input/android/frameworks/base/services/input/EventHub.cpp	1970-01-01 00:00:00 +0000
@@ -1,1502 +0,0 @@
-/*
- * Copyright (C) 2005 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#define LOG_TAG "EventHub"
-
-// #define LOG_NDEBUG 0
-
-#include "EventHub.h"
-
-#define acquire_wake_lock(lock, id) {}
-#define release_wake_lock(id) {}
-
-#include "mir/input/input_report.h"
-#include "mir/udev/wrapper.h"
-
-#include <cutils/properties.h>
-#include <std/Log.h>
-#include <std/Timers.h>
-#include <std/Errors.h>
-
-#include <stdlib.h>
-#include <unistd.h>
-#include <fcntl.h>
-#include <memory.h>
-#include <errno.h>
-#include <assert.h>
-
-#include <androidfw/KeyLayoutMap.h>
-#include <androidfw/KeyCharacterMap.h>
-#include <androidfw/VirtualKeyMap.h>
-
-#include <android/keycodes.h>
-#include <boost/uuid/sha1.hpp>
-
-#include <string.h>
-#include <stdint.h>
-#include <dirent.h>
-
-#include <sys/inotify.h>
-#include <sys/epoll.h>
-#include <sys/ioctl.h>
-#include <sys/timerfd.h>
-// <mir changes>
-// Needed to build on android platform (PATH_MAX)
-#ifdef HAVE_ANDROID_OS
-#include <sys/limits.h>
-#endif
-#include <linux/limits.h>
-// </mir changes>
-
-/* this macro is used to tell if "bit" is set in "array"
- * it selects a byte from the array, and does a boolean AND
- * operation with a byte that only has the relevant bit set.
- * eg. to check for the 12th bit, we do (array[1] & 1<<4)
- */
-#define test_bit(bit, array)    (array[bit/8] & (1<<(bit%8)))
-
-/* this macro computes the number of bytes needed to represent a bit array of the specified size */
-#define sizeof_bit_array(bits)  ((bits + 7) / 8)
-
-#define INDENT "  "
-#define INDENT2 "    "
-#define INDENT3 "      "
-
-namespace mi = mir::input;
-
-namespace android {
-
-static const char *WAKE_LOCK_ID = "KeyEvents";
-static const char *DEVICE_PATH = "/dev/input";
-
-/* return the larger integer */
-static inline int max(int v1, int v2)
-{
-    return (v1 > v2) ? v1 : v2;
-}
-
-static inline const char* toString(bool value) {
-    return value ? "true" : "false";
-}
-
-namespace detail
-{
-String8 sha1(const String8& in) {
-    boost::uuids::detail::sha1 hasher;
-    hasher.process_bytes(in.data(), in.size());
-
-    unsigned int digest[5];
-    hasher.get_digest(digest);
-
-    String8 out;
-    for(int i : digest) {
-        appendFormat(out, "%08x", i);
-    }
-
-    return out;
-}
-}
-
-using detail::sha1;
-
-static void setDescriptor(InputDeviceIdentifier& identifier) {
-    // Compute a device descriptor that uniquely identifies the device.
-    // The descriptor is assumed to be a stable identifier.  Its value should not
-    // change between reboots, reconnections, firmware updates or new releases of Android.
-    // Ideally, we also want the descriptor to be short and relatively opaque.
-    String8 rawDescriptor;
-    appendFormat(rawDescriptor, ":%04x:%04x:", identifier.vendor, identifier.product);
-    if (!isEmpty(identifier.uniqueId)) {
-        rawDescriptor.append("uniqueId:");
-        rawDescriptor.append(identifier.uniqueId);
-    } if (identifier.vendor == 0 && identifier.product == 0) {
-        // If we don't know the vendor and product id, then the device is probably
-        // built-in so we need to rely on other information to uniquely identify
-        // the input device.  Usually we try to avoid relying on the device name or
-        // location but for built-in input device, they are unlikely to ever change.
-        if (!isEmpty(identifier.name)) {
-            rawDescriptor.append("name:");
-            rawDescriptor.append(identifier.name);
-        } else if (!isEmpty(identifier.location)) {
-            rawDescriptor.append("location:");
-            rawDescriptor.append(identifier.location);
-        }
-    }
-    identifier.descriptor = sha1(rawDescriptor);
-    ALOGV("Created descriptor: raw=%s, cooked=%s", c_str(rawDescriptor),
-        c_str(identifier.descriptor));
-}
-
-// --- EventHub::Device ---
-
-EventHub::Device::Device(int fd, int32_t id, const String8& path,
-        const InputDeviceIdentifier& identifier) :
-        next(NULL),
-        fd(fd), id(id), path(path), identifier(identifier),
-        classes(0), configuration(NULL), virtualKeyMap(NULL),
-        ffEffectPlaying(false), ffEffectId(-1) {
-    memset(keyBitmask, 0, sizeof(keyBitmask));
-    memset(absBitmask, 0, sizeof(absBitmask));
-    memset(relBitmask, 0, sizeof(relBitmask));
-    memset(swBitmask, 0, sizeof(swBitmask));
-    memset(ledBitmask, 0, sizeof(ledBitmask));
-    memset(ffBitmask, 0, sizeof(ffBitmask));
-    memset(propBitmask, 0, sizeof(propBitmask));
-}
-
-EventHub::Device::~Device() {
-    close();
-    delete configuration;
-    delete virtualKeyMap;
-}
-
-void EventHub::Device::close() {
-    if (fd >= 0) {
-        ::close(fd);
-        fd = -1;
-    }
-}
-
-
-// --- EventHub ---
-
-const uint32_t EventHub::EPOLL_ID_UDEV;
-const uint32_t EventHub::EPOLL_ID_WAKE;
-const uint32_t EventHub::EPOLL_ID_TIMER;
-const int EventHub::EPOLL_SIZE_HINT;
-const int EventHub::EPOLL_MAX_EVENTS;
-
-EventHub::EventHub(std::shared_ptr<mi::InputReport> const& input_report) :
-        input_report(input_report),
-        device_listener{new mir::udev::Monitor{mir::udev::Context()}},
-        mBuiltInKeyboardId(NO_BUILT_IN_KEYBOARD), mNextDeviceId(1),
-        mOpeningDevices(0), mClosingDevices(0),
-        mNeedToSendFinishedDeviceScan(false),
-        mNeedToReopenDevices(false), mNeedToScanDevices(true),
-        mEpollFd{epoll_create(EPOLL_SIZE_HINT)},
-        mTimerFd{timerfd_create(CLOCK_MONOTONIC, TFD_NONBLOCK|TFD_CLOEXEC)},
-        mPendingEventCount(0), mPendingEventIndex(0), mPendingUdevEvent(false) {
-    acquire_wake_lock(PARTIAL_WAKE_LOCK, WAKE_LOCK_ID);
-
-    LOG_ALWAYS_FATAL_IF(mEpollFd < 0, "Could not create epoll instance.  errno=%d", errno);
-    LOG_ALWAYS_FATAL_IF(mTimerFd < 0, "Could not create timerfd.  errno=%d", errno);
-
-    device_listener->filter_by_subsystem("input");
-    device_listener->enable();
-
-
-    struct epoll_event eventItem;
-    memset(&eventItem, 0, sizeof(eventItem));
-    eventItem.events = EPOLLIN;
-    eventItem.data.u32 = EPOLL_ID_UDEV;
-    int result = epoll_ctl(mEpollFd, EPOLL_CTL_ADD, device_listener->fd(), &eventItem);
-    LOG_ALWAYS_FATAL_IF(result != 0, "Could not add Udev monitor to epoll instance.  errno=%d", errno);
-
-    int wakeFds[2];
-    result = pipe(wakeFds);
-    LOG_ALWAYS_FATAL_IF(result != 0, "Could not create wake pipe.  errno=%d", errno);
-
-    mWakeReadPipeFd = wakeFds[0];
-    mWakeWritePipeFd = wakeFds[1];
-
-    result = fcntl(mWakeReadPipeFd, F_SETFL, O_NONBLOCK);
-    LOG_ALWAYS_FATAL_IF(result != 0, "Could not make wake read pipe non-blocking.  errno=%d",
-            errno);
-
-    result = fcntl(mWakeWritePipeFd, F_SETFL, O_NONBLOCK);
-    LOG_ALWAYS_FATAL_IF(result != 0, "Could not make wake write pipe non-blocking.  errno=%d",
-            errno);
-
-    eventItem.data.u32 = EPOLL_ID_WAKE;
-    result = epoll_ctl(mEpollFd, EPOLL_CTL_ADD, mWakeReadPipeFd, &eventItem);
-    LOG_ALWAYS_FATAL_IF(result != 0, "Could not add wake read pipe to epoll instance.  errno=%d",
-            errno);
-
-    eventItem.data.u32 = EPOLL_ID_TIMER;
-    result = epoll_ctl(mEpollFd, EPOLL_CTL_ADD, mTimerFd, &eventItem);
-    LOG_ALWAYS_FATAL_IF(result != 0, "Could not add timer fd to epoll instance.  errno=%d",
-                        errno);
-}
-
-EventHub::~EventHub(void) {
-    closeAllDevicesLocked();
-
-    while (mClosingDevices) {
-        Device* device = mClosingDevices;
-        mClosingDevices = device->next;
-        delete device;
-    }
-
-    ::close(mWakeReadPipeFd);
-    ::close(mWakeWritePipeFd);
-
-    release_wake_lock(WAKE_LOCK_ID);
-}
-
-InputDeviceIdentifier EventHub::getDeviceIdentifier(int32_t deviceId) const {
-    AutoMutex _l(mLock);
-    Device* device = getDeviceLocked(deviceId);
-    if (device == NULL) return InputDeviceIdentifier();
-    return device->identifier;
-}
-
-uint32_t EventHub::getDeviceClasses(int32_t deviceId) const {
-    AutoMutex _l(mLock);
-    Device* device = getDeviceLocked(deviceId);
-    if (device == NULL) return 0;
-    return device->classes;
-}
-
-void EventHub::getConfiguration(int32_t deviceId, PropertyMap* outConfiguration) const {
-    AutoMutex _l(mLock);
-    Device* device = getDeviceLocked(deviceId);
-    if (device && device->configuration) {
-        *outConfiguration = *device->configuration;
-    } else {
-        outConfiguration->clear();
-    }
-}
-
-status_t EventHub::getAbsoluteAxisInfo(int32_t deviceId, int axis,
-        RawAbsoluteAxisInfo* outAxisInfo) const {
-    outAxisInfo->clear();
-
-    if (axis >= 0 && axis <= ABS_MAX) {
-        AutoMutex _l(mLock);
-
-        Device* device = getDeviceLocked(deviceId);
-        if (device && !device->isVirtual() && test_bit(axis, device->absBitmask)) {
-            struct input_absinfo info;
-            if(ioctl(device->fd, EVIOCGABS(axis), &info)) {
-                ALOGW("Error reading absolute controller %d for device %s fd %d, errno=%d",
-                     axis, c_str(device->identifier.name), device->fd, errno);
-                return -errno;
-            }
-
-            if (info.minimum != info.maximum) {
-                outAxisInfo->valid = true;
-                outAxisInfo->minValue = info.minimum;
-                outAxisInfo->maxValue = info.maximum;
-                outAxisInfo->flat = info.flat;
-                outAxisInfo->fuzz = info.fuzz;
-                outAxisInfo->resolution = info.resolution;
-            }
-            return OK;
-        }
-    }
-    return -1;
-}
-
-bool EventHub::hasRelativeAxis(int32_t deviceId, int axis) const {
-    if (axis >= 0 && axis <= REL_MAX) {
-        AutoMutex _l(mLock);
-
-        Device* device = getDeviceLocked(deviceId);
-        if (device) {
-            return test_bit(axis, device->relBitmask);
-        }
-    }
-    return false;
-}
-
-bool EventHub::hasInputProperty(int32_t deviceId, int property) const {
-    if (property >= 0 && property <= INPUT_PROP_MAX) {
-        AutoMutex _l(mLock);
-
-        Device* device = getDeviceLocked(deviceId);
-        if (device) {
-            return test_bit(property, device->propBitmask);
-        }
-    }
-    return false;
-}
-
-int32_t EventHub::getScanCodeState(int32_t deviceId, int32_t scanCode) const {
-    if (scanCode >= 0 && scanCode <= KEY_MAX) {
-        AutoMutex _l(mLock);
-
-        Device* device = getDeviceLocked(deviceId);
-        if (device && !device->isVirtual() && test_bit(scanCode, device->keyBitmask)) {
-            uint8_t keyState[sizeof_bit_array(KEY_MAX + 1)];
-            memset(keyState, 0, sizeof(keyState));
-            if (ioctl(device->fd, EVIOCGKEY(sizeof(keyState)), keyState) >= 0) {
-                return test_bit(scanCode, keyState) ? AKEY_STATE_DOWN : AKEY_STATE_UP;
-            }
-        }
-    }
-    return AKEY_STATE_UNKNOWN;
-}
-
-int32_t EventHub::getKeyCodeState(int32_t deviceId, int32_t keyCode) const {
-    AutoMutex _l(mLock);
-
-    Device* device = getDeviceLocked(deviceId);
-    if (device && !device->isVirtual() && device->keyMap.haveKeyLayout()) {
-        Vector<int32_t> scanCodes;
-        device->keyMap.keyLayoutMap->findScanCodesForKey(keyCode, &scanCodes);
-        if (scanCodes.size() != 0) {
-            uint8_t keyState[sizeof_bit_array(KEY_MAX + 1)];
-            memset(keyState, 0, sizeof(keyState));
-            if (ioctl(device->fd, EVIOCGKEY(sizeof(keyState)), keyState) >= 0) {
-                for (size_t i = 0; i < scanCodes.size(); i++) {
-                    int32_t sc = scanCodes.itemAt(i);
-                    if (sc >= 0 && sc <= KEY_MAX && test_bit(sc, keyState)) {
-                        return AKEY_STATE_DOWN;
-                    }
-                }
-                return AKEY_STATE_UP;
-            }
-        }
-    }
-    return AKEY_STATE_UNKNOWN;
-}
-
-int32_t EventHub::getSwitchState(int32_t deviceId, int32_t sw) const {
-    if (sw >= 0 && sw <= SW_MAX) {
-        AutoMutex _l(mLock);
-
-        Device* device = getDeviceLocked(deviceId);
-        if (device && !device->isVirtual() && test_bit(sw, device->swBitmask)) {
-            uint8_t swState[sizeof_bit_array(SW_MAX + 1)];
-            memset(swState, 0, sizeof(swState));
-            if (ioctl(device->fd, EVIOCGSW(sizeof(swState)), swState) >= 0) {
-                return test_bit(sw, swState) ? AKEY_STATE_DOWN : AKEY_STATE_UP;
-            }
-        }
-    }
-    return AKEY_STATE_UNKNOWN;
-}
-
-status_t EventHub::getAbsoluteAxisValue(int32_t deviceId, int32_t axis, int32_t* outValue) const {
-    *outValue = 0;
-
-    if (axis >= 0 && axis <= ABS_MAX) {
-        AutoMutex _l(mLock);
-
-        Device* device = getDeviceLocked(deviceId);
-        if (device && !device->isVirtual() && test_bit(axis, device->absBitmask)) {
-            struct input_absinfo info;
-            if(ioctl(device->fd, EVIOCGABS(axis), &info)) {
-                ALOGW("Error reading absolute controller %d for device %s fd %d, errno=%d",
-                     axis, c_str(device->identifier.name), device->fd, errno);
-                return -errno;
-            }
-
-            *outValue = info.value;
-            return OK;
-        }
-    }
-    return -1;
-}
-
-bool EventHub::markSupportedKeyCodes(int32_t deviceId, size_t numCodes,
-        const int32_t* keyCodes, uint8_t* outFlags) const {
-    AutoMutex _l(mLock);
-
-    Device* device = getDeviceLocked(deviceId);
-    if (device && device->keyMap.haveKeyLayout()) {
-        Vector<int32_t> scanCodes;
-        for (size_t codeIndex = 0; codeIndex < numCodes; codeIndex++) {
-            scanCodes.clear();
-
-            status_t err = device->keyMap.keyLayoutMap->findScanCodesForKey(
-                    keyCodes[codeIndex], &scanCodes);
-            if (! err) {
-                // check the possible scan codes identified by the layout map against the
-                // map of codes actually emitted by the driver
-                for (size_t sc = 0; sc < scanCodes.size(); sc++) {
-                    if (test_bit(scanCodes[sc], device->keyBitmask)) {
-                        outFlags[codeIndex] = 1;
-                        break;
-                    }
-                }
-            }
-        }
-        return true;
-    }
-    return false;
-}
-
-status_t EventHub::mapKey(int32_t deviceId, int32_t scanCode, int32_t usageCode,
-        int32_t* outKeycode, uint32_t* outFlags) const {
-    AutoMutex _l(mLock);
-    Device* device = getDeviceLocked(deviceId);
-
-    if (device) {
-        // Check the key character map first.
-        sp<KeyCharacterMap> kcm = device->getKeyCharacterMap();
-        if (kcm != NULL) {
-            if (!kcm->mapKey(scanCode, usageCode, outKeycode)) {
-                *outFlags = 0;
-                return NO_ERROR;
-            }
-        }
-
-        // Check the key layout next.
-        if (device->keyMap.haveKeyLayout()) {
-            if (!device->keyMap.keyLayoutMap->mapKey(
-                    scanCode, usageCode, outKeycode, outFlags)) {
-                return NO_ERROR;
-            }
-        }
-    }
-
-    *outKeycode = 0;
-    *outFlags = 0;
-    return NAME_NOT_FOUND;
-}
-
-status_t EventHub::mapAxis(int32_t deviceId, int32_t scanCode, AxisInfo* outAxisInfo) const {
-    AutoMutex _l(mLock);
-    Device* device = getDeviceLocked(deviceId);
-
-    if (device && device->keyMap.haveKeyLayout()) {
-        status_t err = device->keyMap.keyLayoutMap->mapAxis(scanCode, outAxisInfo);
-        if (err == NO_ERROR) {
-            return NO_ERROR;
-        }
-    }
-
-    return NAME_NOT_FOUND;
-}
-
-void EventHub::setExcludedDevices(const Vector<String8>& devices) {
-    AutoMutex _l(mLock);
-
-    mExcludedDevices = devices;
-}
-
-bool EventHub::hasScanCode(int32_t deviceId, int32_t scanCode) const {
-    AutoMutex _l(mLock);
-    Device* device = getDeviceLocked(deviceId);
-    if (device && scanCode >= 0 && scanCode <= KEY_MAX) {
-        if (test_bit(scanCode, device->keyBitmask)) {
-            return true;
-        }
-    }
-    return false;
-}
-
-bool EventHub::hasLed(int32_t deviceId, int32_t led) const {
-    AutoMutex _l(mLock);
-    Device* device = getDeviceLocked(deviceId);
-    if (device && led >= 0 && led <= LED_MAX) {
-        if (test_bit(led, device->ledBitmask)) {
-            return true;
-        }
-    }
-    return false;
-}
-
-void EventHub::setLedState(int32_t deviceId, int32_t led, bool on) {
-    AutoMutex _l(mLock);
-    Device* device = getDeviceLocked(deviceId);
-    if (device && !device->isVirtual() && led >= 0 && led <= LED_MAX) {
-        struct input_event ev;
-        ev.time.tv_sec = 0;
-        ev.time.tv_usec = 0;
-        ev.type = EV_LED;
-        ev.code = led;
-        ev.value = on ? 1 : 0;
-
-        ssize_t nWrite;
-        do {
-            nWrite = write(device->fd, &ev, sizeof(struct input_event));
-        } while (nWrite == -1 && errno == EINTR);
-    }
-}
-
-void EventHub::getVirtualKeyDefinitions(int32_t deviceId,
-        Vector<VirtualKeyDefinition>& outVirtualKeys) const {
-    outVirtualKeys.clear();
-
-    AutoMutex _l(mLock);
-    Device* device = getDeviceLocked(deviceId);
-    if (device && device->virtualKeyMap) {
-        outVirtualKeys.appendVector(device->virtualKeyMap->getVirtualKeys());
-    }
-}
-
-sp<KeyCharacterMap> EventHub::getKeyCharacterMap(int32_t deviceId) const {
-    AutoMutex _l(mLock);
-    Device* device = getDeviceLocked(deviceId);
-    if (device) {
-        return device->getKeyCharacterMap();
-    }
-    return NULL;
-}
-
-bool EventHub::setKeyboardLayoutOverlay(int32_t deviceId,
-        const sp<KeyCharacterMap>& map) {
-    AutoMutex _l(mLock);
-    Device* device = getDeviceLocked(deviceId);
-    if (device) {
-        if (map != device->overlayKeyMap) {
-            device->overlayKeyMap = map;
-            device->combinedKeyMap = KeyCharacterMap::combine(
-                    device->keyMap.keyCharacterMap, map);
-            return true;
-        }
-    }
-    return false;
-}
-
-void EventHub::vibrate(int32_t deviceId, std::chrono::nanoseconds duration) {
-    AutoMutex _l(mLock);
-    Device* device = getDeviceLocked(deviceId);
-    if (device && !device->isVirtual()) {
-        ff_effect effect;
-        memset(&effect, 0, sizeof(effect));
-        effect.type = FF_RUMBLE;
-        effect.id = device->ffEffectId;
-        effect.u.rumble.strong_magnitude = 0xc000;
-        effect.u.rumble.weak_magnitude = 0xc000;
-        effect.replay.length = (duration + std::chrono::nanoseconds(999999)) / std::chrono::nanoseconds(1000000LL);
-        effect.replay.delay = 0;
-        if (ioctl(device->fd, EVIOCSFF, &effect)) {
-            ALOGW("Could not upload force feedback effect to device %s due to error %d.",
-                c_str(device->identifier.name), errno);
-            return;
-        }
-        device->ffEffectId = effect.id;
-
-        struct input_event ev;
-        ev.time.tv_sec = 0;
-        ev.time.tv_usec = 0;
-        ev.type = EV_FF;
-        ev.code = device->ffEffectId;
-        ev.value = 1;
-        if (write(device->fd, &ev, sizeof(ev)) != sizeof(ev)) {
-            ALOGW("Could not start force feedback effect on device %s due to error %d.",
-                c_str(device->identifier.name), errno);
-            return;
-        }
-        device->ffEffectPlaying = true;
-    }
-}
-
-void EventHub::cancelVibrate(int32_t deviceId) {
-    AutoMutex _l(mLock);
-    Device* device = getDeviceLocked(deviceId);
-    if (device && !device->isVirtual()) {
-        if (device->ffEffectPlaying) {
-            device->ffEffectPlaying = false;
-
-            struct input_event ev;
-            ev.time.tv_sec = 0;
-            ev.time.tv_usec = 0;
-            ev.type = EV_FF;
-            ev.code = device->ffEffectId;
-            ev.value = 0;
-            if (write(device->fd, &ev, sizeof(ev)) != sizeof(ev)) {
-                ALOGW("Could not stop force feedback effect on device %s due to error %d.",
-                    c_str(device->identifier.name), errno);
-                return;
-            }
-        }
-    }
-}
-
-EventHub::Device* EventHub::getDeviceLocked(int32_t deviceId) const {
-    if (deviceId == BUILT_IN_KEYBOARD_ID) {
-        deviceId = mBuiltInKeyboardId;
-    }
-    ssize_t index = mDevices.indexOfKey(deviceId);
-    return index >= 0 ? mDevices.valueAt(index) : NULL;
-}
-
-EventHub::Device* EventHub::getDeviceByPathLocked(const char* devicePath) const {
-    for (size_t i = 0; i < mDevices.size(); i++) {
-        Device* device = mDevices.valueAt(i);
-        if (device->path == devicePath) {
-            return device;
-        }
-    }
-    return NULL;
-}
-
-size_t EventHub::getEvents(RawEvent* buffer, size_t bufferSize) {
-    ALOG_ASSERT(bufferSize >= 1);
-
-    AutoMutex _l(mLock);
-
-    struct input_event readBuffer[bufferSize];
-
-    RawEvent* event = buffer;
-    size_t capacity = bufferSize;
-    bool awoken = false;
-    for (;;) {
-        std::chrono::nanoseconds now = systemTime(SYSTEM_TIME_MONOTONIC);
-
-        // Reopen input devices if needed.
-        if (mNeedToReopenDevices) {
-            mNeedToReopenDevices = false;
-
-            ALOGI("Reopening all input devices due to a configuration change.");
-
-            closeAllDevicesLocked();
-            mNeedToScanDevices = true;
-            break; // return to the caller before we actually rescan
-        }
-
-        // Report any devices that had last been added/removed.
-        while (mClosingDevices) {
-            Device* device = mClosingDevices;
-            ALOGV("Reporting device closed: id=%d, name=%s\n",
-                 device->id, c_str(device->path));
-            mClosingDevices = device->next;
-            event->when = now;
-            event->deviceId = device->id == mBuiltInKeyboardId ? BUILT_IN_KEYBOARD_ID : device->id;
-            event->type = DEVICE_REMOVED;
-            event += 1;
-            delete device;
-            mNeedToSendFinishedDeviceScan = true;
-            if (--capacity == 0) {
-                break;
-            }
-        }
-
-        if (mNeedToScanDevices) {
-            mNeedToScanDevices = false;
-            scanDevicesLocked();
-            mNeedToSendFinishedDeviceScan = true;
-        }
-
-        while (mOpeningDevices != NULL) {
-            Device* device = mOpeningDevices;
-            ALOGV("Reporting device opened: id=%d, name=%s\n",
-                 device->id, c_str(device->path));
-            mOpeningDevices = device->next;
-            event->when = now;
-            event->deviceId = device->id == mBuiltInKeyboardId ? 0 : device->id;
-            event->type = DEVICE_ADDED;
-            event += 1;
-            mNeedToSendFinishedDeviceScan = true;
-            if (--capacity == 0) {
-                break;
-            }
-        }
-
-        if (mNeedToSendFinishedDeviceScan) {
-            mNeedToSendFinishedDeviceScan = false;
-            event->when = now;
-            event->type = FINISHED_DEVICE_SCAN;
-            event += 1;
-            if (--capacity == 0) {
-                break;
-            }
-        }
-
-        // Grab the next input event.
-        bool deviceChanged = false;
-        while (mPendingEventIndex < mPendingEventCount) {
-            const struct epoll_event& eventItem = mPendingEventItems[mPendingEventIndex++];
-            if (eventItem.data.u32 == EPOLL_ID_UDEV) {
-                if (eventItem.events & EPOLLIN) {
-                    mPendingUdevEvent = true;
-                } else {
-                    ALOGW("Received unexpected epoll event 0x%08x for INotify.", eventItem.events);
-                }
-                continue;
-            }
-
-            if (eventItem.data.u32 == EPOLL_ID_WAKE) {
-                if (eventItem.events & EPOLLIN) {
-                    ALOGV("awoken after wake()");
-                    awoken = true;
-                    char buffer[16];
-                    ssize_t nRead;
-                    do {
-                        nRead = read(mWakeReadPipeFd, buffer, sizeof(buffer));
-                    } while ((nRead == -1 && errno == EINTR) || nRead == sizeof(buffer));
-                } else {
-                    ALOGW("Received unexpected epoll event 0x%08x for wake read pipe.",
-                            eventItem.events);
-                }
-                continue;
-            }
-
-            if (eventItem.data.u32 == EPOLL_ID_TIMER) {
-                if (eventItem.events & EPOLLIN) {
-                    ALOGV("awoken after wakeIn()");
-                    awoken = true;
-                    uint64_t timeout_count;
-                    read(mTimerFd, &timeout_count, sizeof timeout_count);
-                } else {
-                    ALOGW("Received unexpected epoll event 0x%08x for wake read pipe.",
-                          eventItem.events);
-                }
-                continue;
-            }
-
-            ssize_t deviceIndex = mDevices.indexOfKey(eventItem.data.u32);
-            if (deviceIndex < 0) {
-                ALOGW("Received unexpected epoll event 0x%08x for unknown device id %d.",
-                        eventItem.events, eventItem.data.u32);
-                continue;
-            }
-
-            Device* device = mDevices.valueAt(deviceIndex);
-            if (eventItem.events & EPOLLIN) {
-                int32_t readSize = read(device->fd, readBuffer,
-                        sizeof(struct input_event) * capacity);
-                if (readSize == 0 || (readSize < 0 && errno == ENODEV)) {
-                    // Device was removed before INotify noticed.
-                    ALOGW("could not get event, removed? (fd: %d size: %d bufferSize: %d "
-                            "capacity: %d errno: %d)\n",
-                            device->fd, readSize, bufferSize, capacity, errno);
-                    deviceChanged = true;
-                    closeDeviceLocked(device);
-                } else if (readSize < 0) {
-                    if (errno != EAGAIN && errno != EINTR) {
-                        ALOGW("could not get event (errno=%d)", errno);
-                    }
-                } else if ((readSize % sizeof(struct input_event)) != 0) {
-                    ALOGE("could not get event (wrong size: %d)", readSize);
-                } else {
-                    int32_t deviceId = device->id == mBuiltInKeyboardId ? 0 : device->id;
-
-                    size_t count = size_t(readSize) / sizeof(struct input_event);
-                    for (size_t i = 0; i < count; i++) {
-                        const struct input_event& iev = readBuffer[i];
-                        ALOGV("%s got: t0=%d, t1=%d, type=%d, code=%d, value=%d",
-                            c_str(device->path),
-                                (int) iev.time.tv_sec, (int) iev.time.tv_usec,
-                                iev.type, iev.code, iev.value);
-
-#ifdef HAVE_POSIX_CLOCKS
-                        // Use the time specified in the event instead of the current time
-                        // so that downstream code can get more accurate estimates of
-                        // event dispatch latency from the time the event is enqueued onto
-                        // the evdev client buffer.
-                        //
-                        // The event's timestamp fortuitously uses the same monotonic clock
-                        // time base as the rest of Android.  The kernel event device driver
-                        // (drivers/input/evdev.c) obtains timestamps using ktime_get_ts().
-                        // The systemTime(SYSTEM_TIME_MONOTONIC) function we use everywhere
-                        // calls clock_gettime(CLOCK_MONOTONIC) which is implemented as a
-                        // system call that also queries ktime_get_ts().
-                        event->when = std::chrono::nanoseconds(iev.time.tv_sec) * 1000000000LL
-                                + std::chrono::nanoseconds(iev.time.tv_usec) * 1000LL;
-                        ALOGV("event time %lld, now %lld", event->when, now);
-#else
-                        event->when = now;
-#endif
-                        event->deviceId = deviceId;
-                        event->type = iev.type;
-                        event->code = iev.code;
-                        event->value = iev.value;
-
-                        input_report->received_event_from_kernel(event->when.count(), event->type, event->code, event->value);
-
-                        event += 1;
-                    }
-                    capacity -= count;
-                    if (capacity == 0) {
-                        // The result buffer is full.  Reset the pending event index
-                        // so we will try to read the device again on the next iteration.
-                        mPendingEventIndex -= 1;
-                        break;
-                    }
-                }
-            } else if (eventItem.events & EPOLLHUP) {
-                ALOGI("Removing device %s due to epoll hang-up event.",
-                    c_str(device->identifier.name));
-                deviceChanged = true;
-                closeDeviceLocked(device);
-            } else {
-                ALOGW("Received unexpected epoll event 0x%08x for device %s.",
-                        eventItem.events, c_str(device->identifier.name));
-            }
-        }
-
-        // readNotify() will modify the list of devices so this must be done after
-        // processing all other events to ensure that we read all remaining events
-        // before closing the devices.
-        if (mPendingUdevEvent && mPendingEventIndex >= mPendingEventCount) {
-            mPendingUdevEvent = false;
-            handleUdevEventsLocked();
-            deviceChanged = true;
-        }
-
-        // Report added or removed devices immediately.
-        if (deviceChanged) {
-            continue;
-        }
-
-        // Return now if we have collected any events or if we were explicitly awoken.
-        if (event != buffer || awoken) {
-            break;
-        }
-
-        // Poll for events.  Mind the wake lock dance!
-        // We hold a wake lock at all times except during epoll_wait().  This works due to some
-        // subtle choreography.  When a device driver has pending (unread) events, it acquires
-        // a kernel wake lock.  However, once the last pending event has been read, the device
-        // driver will release the kernel wake lock.  To prevent the system from going to sleep
-        // when this happens, the EventHub holds onto its own user wake lock while the client
-        // is processing events.  Thus the system can only sleep if there are no events
-        // pending or currently being processed.
-        mPendingEventIndex = 0;
-
-        mLock.unlock(); // release lock before poll, must be before release_wake_lock
-        release_wake_lock(WAKE_LOCK_ID);
-
-        // non blocking call to epoll_wait - blocking happens in dispatch threads
-        int pollResult = epoll_wait(mEpollFd, mPendingEventItems, EPOLL_MAX_EVENTS, 0);
-
-        acquire_wake_lock(PARTIAL_WAKE_LOCK, WAKE_LOCK_ID);
-        mLock.lock(); // reacquire lock after poll, must be after acquire_wake_lock
-
-        if (pollResult == 0) {
-            // Timed out.
-            mPendingEventCount = 0;
-            break;
-        }
-
-        if (pollResult < 0) {
-            // An error occurred.
-            mPendingEventCount = 0;
-
-            // Sleep after errors to avoid locking up the system.
-            // Hopefully the error is transient.
-            if (errno != EINTR) {
-                ALOGW("poll failed (errno=%d)\n", errno);
-                usleep(100000);
-            }
-        } else {
-            // Some events occurred.
-            mPendingEventCount = size_t(pollResult);
-        }
-    }
-
-    // All done, return the number of events we read.
-    return event - buffer;
-}
-
-void EventHub::wakeIn(int32_t timeoutMillis) {
-    itimerspec delay;
-    std::memset(&delay, 0, sizeof delay);
-
-    delay.it_value.tv_sec = timeoutMillis / 1000;
-    delay.it_value.tv_nsec = (timeoutMillis % 1000) * 1000000LL;
-    timerfd_settime(mTimerFd, 0, &delay, nullptr);
-}
-
-void EventHub::wake() {
-    ALOGV("wake() called");
-
-    ssize_t nWrite;
-    do {
-        nWrite = write(mWakeWritePipeFd, "W", 1);
-    } while (nWrite == -1 && errno == EINTR);
-
-    if (nWrite != 1 && errno != EAGAIN) {
-        ALOGW("Could not write wake signal, errno=%d", errno);
-    }
-}
-
-void EventHub::scanDevicesLocked() {
-    mir::udev::Enumerator input_enumerator{std::make_shared<mir::udev::Context>()};
-
-    input_enumerator.match_subsystem("input");
-    input_enumerator.scan_devices();
-
-    for (auto& device : input_enumerator)
-    {
-        if (device.devnode() != nullptr)
-        {
-            openDeviceLocked(device.devnode());
-        }
-    }
-
-    if (mDevices.indexOfKey(VIRTUAL_KEYBOARD_ID) < 0) {
-        createVirtualKeyboardLocked();
-    }
-}
-
-void EventHub::handleUdevEventsLocked()
-{
-    device_listener->process_events([this](mir::udev::Monitor::EventType type, mir::udev::Device const& dev){
-        if (type == mir::udev::Monitor::ADDED)
-        {
-            if (dev.devnode() != nullptr)
-            {
-                openDeviceLocked(dev.devnode());
-            }
-        }
-        else if (type == mir::udev::Monitor::REMOVED)
-        {
-            if (dev.devnode() != nullptr)
-            {
-                closeDeviceByPathLocked(dev.devnode());
-            }
-        }
-    });
-}
-
-// ----------------------------------------------------------------------------
-
-static bool containsNonZeroByte(const uint8_t* array, uint32_t startIndex, uint32_t endIndex) {
-    const uint8_t* end = array + endIndex;
-    array += startIndex;
-    while (array != end) {
-        if (*(array++) != 0) {
-            return true;
-        }
-    }
-    return false;
-}
-
-static const int32_t GAMEPAD_KEYCODES[] = {
-        AKEYCODE_BUTTON_A, AKEYCODE_BUTTON_B, AKEYCODE_BUTTON_C,
-        AKEYCODE_BUTTON_X, AKEYCODE_BUTTON_Y, AKEYCODE_BUTTON_Z,
-        AKEYCODE_BUTTON_L1, AKEYCODE_BUTTON_R1,
-        AKEYCODE_BUTTON_L2, AKEYCODE_BUTTON_R2,
-        AKEYCODE_BUTTON_THUMBL, AKEYCODE_BUTTON_THUMBR,
-        AKEYCODE_BUTTON_START, AKEYCODE_BUTTON_SELECT, AKEYCODE_BUTTON_MODE,
-        AKEYCODE_BUTTON_1, AKEYCODE_BUTTON_2, AKEYCODE_BUTTON_3, AKEYCODE_BUTTON_4,
-        AKEYCODE_BUTTON_5, AKEYCODE_BUTTON_6, AKEYCODE_BUTTON_7, AKEYCODE_BUTTON_8,
-        AKEYCODE_BUTTON_9, AKEYCODE_BUTTON_10, AKEYCODE_BUTTON_11, AKEYCODE_BUTTON_12,
-        AKEYCODE_BUTTON_13, AKEYCODE_BUTTON_14, AKEYCODE_BUTTON_15, AKEYCODE_BUTTON_16,
-};
-
-status_t EventHub::openDeviceLocked(const char *devicePath) {
-    char buffer[80];
-
-    ALOGV("Opening device: %s", devicePath);
-    if (hasDeviceByPathLocked(String8(devicePath)))
-    {
-        ALOGV("Not opening device (%s), as it is already opened", devicePath);
-        return -1;
-    }
-
-    int fd = open(devicePath, O_RDWR | O_CLOEXEC);
-    if(fd < 0) {
-        ALOGE("could not open %s, %s\n", devicePath, strerror(errno));
-        return -1;
-    }
-
-    InputDeviceIdentifier identifier;
-
-    // Get device name.
-    if(ioctl(fd, EVIOCGNAME(sizeof(buffer) - 1), &buffer) < 1) {
-        //fprintf(stderr, "could not get device name for %s, %s\n", devicePath, strerror(errno));
-    } else {
-        buffer[sizeof(buffer) - 1] = '\0';
-        setTo(identifier.name, buffer);
-    }
-
-    // Check to see if the device is on our excluded list
-    for (size_t i = 0; i < mExcludedDevices.size(); i++) {
-        const String8& item = mExcludedDevices.itemAt(i);
-        if (identifier.name == item) {
-            ALOGI("ignoring event id %s driver %s\n", devicePath, c_str(item));
-            close(fd);
-            return -1;
-        }
-    }
-
-    // Get device driver version.
-    int driverVersion;
-    if(ioctl(fd, EVIOCGVERSION, &driverVersion)) {
-        ALOGE("could not get driver version for %s, %s\n", devicePath, strerror(errno));
-        close(fd);
-        return -1;
-    }
-
-    // Get device identifier.
-    struct input_id inputId;
-    if(ioctl(fd, EVIOCGID, &inputId)) {
-        ALOGE("could not get device input id for %s, %s\n", devicePath, strerror(errno));
-        close(fd);
-        return -1;
-    }
-    identifier.bus = inputId.bustype;
-    identifier.product = inputId.product;
-    identifier.vendor = inputId.vendor;
-    identifier.version = inputId.version;
-
-    // Get device physical location.
-    if(ioctl(fd, EVIOCGPHYS(sizeof(buffer) - 1), &buffer) < 1) {
-        //fprintf(stderr, "could not get location for %s, %s\n", devicePath, strerror(errno));
-    } else {
-        buffer[sizeof(buffer) - 1] = '\0';
-        setTo(identifier.location, buffer);
-    }
-
-    // Get device unique id.
-    if(ioctl(fd, EVIOCGUNIQ(sizeof(buffer) - 1), &buffer) < 1) {
-        //fprintf(stderr, "could not get idstring for %s, %s\n", devicePath, strerror(errno));
-    } else {
-        buffer[sizeof(buffer) - 1] = '\0';
-        setTo(identifier.uniqueId, buffer);
-    }
-
-    // Fill in the descriptor.
-    setDescriptor(identifier);
-
-    // Make file descriptor non-blocking for use with poll().
-    if (fcntl(fd, F_SETFL, O_NONBLOCK)) {
-        ALOGE("Error %d making device file descriptor non-blocking.", errno);
-        close(fd);
-        return -1;
-    }
-
-    // Allocate device.  (The device object takes ownership of the fd at this point.)
-    int32_t deviceId = mNextDeviceId++;
-    Device* device = new Device(fd, deviceId, String8(devicePath), identifier);
-
-    ALOGV("add device %d: %s\n", deviceId, devicePath);
-    ALOGV("  bus:        %04x\n"
-         "  vendor      %04x\n"
-         "  product     %04x\n"
-         "  version     %04x\n",
-        identifier.bus, identifier.vendor, identifier.product, identifier.version);
-    ALOGV("  name:       \"%s\"\n", c_str(identifier.name));
-    ALOGV("  location:   \"%s\"\n", c_str(identifier.location));
-    ALOGV("  unique id:  \"%s\"\n", c_str(identifier.uniqueId));
-    ALOGV("  descriptor: \"%s\"\n", c_str(identifier.descriptor));
-    ALOGV("  driver:     v%d.%d.%d\n",
-        driverVersion >> 16, (driverVersion >> 8) & 0xff, driverVersion & 0xff);
-
-    // Load the configuration file for the device.
-    loadConfigurationLocked(device);
-
-    // Figure out the kinds of events the device reports.
-    ioctl(fd, EVIOCGBIT(EV_KEY, sizeof(device->keyBitmask)), device->keyBitmask);
-    ioctl(fd, EVIOCGBIT(EV_ABS, sizeof(device->absBitmask)), device->absBitmask);
-    ioctl(fd, EVIOCGBIT(EV_REL, sizeof(device->relBitmask)), device->relBitmask);
-    ioctl(fd, EVIOCGBIT(EV_SW, sizeof(device->swBitmask)), device->swBitmask);
-    ioctl(fd, EVIOCGBIT(EV_LED, sizeof(device->ledBitmask)), device->ledBitmask);
-    ioctl(fd, EVIOCGBIT(EV_FF, sizeof(device->ffBitmask)), device->ffBitmask);
-    ioctl(fd, EVIOCGPROP(sizeof(device->propBitmask)), device->propBitmask);
-
-    // See if this is a keyboard.  Ignore everything in the button range except for
-    // joystick and gamepad buttons which are handled like keyboards for the most part.
-    bool haveKeyboardKeys = containsNonZeroByte(device->keyBitmask, 0, sizeof_bit_array(BTN_MISC))
-            || containsNonZeroByte(device->keyBitmask, sizeof_bit_array(KEY_OK),
-                    sizeof_bit_array(KEY_MAX + 1));
-    bool haveGamepadButtons = containsNonZeroByte(device->keyBitmask, sizeof_bit_array(BTN_MISC),
-                    sizeof_bit_array(BTN_MOUSE))
-            || containsNonZeroByte(device->keyBitmask, sizeof_bit_array(BTN_JOYSTICK),
-                    sizeof_bit_array(BTN_DIGI));
-    if (haveKeyboardKeys || haveGamepadButtons) {
-        device->classes |= INPUT_DEVICE_CLASS_KEYBOARD;
-    }
-
-    // See if this is a cursor device such as a trackball or mouse.
-    if (test_bit(BTN_MOUSE, device->keyBitmask)
-            && test_bit(REL_X, device->relBitmask)
-            && test_bit(REL_Y, device->relBitmask)) {
-        device->classes |= INPUT_DEVICE_CLASS_CURSOR;
-    }
-
-    // See if this is a touch pad.
-    // Is this a new modern multi-touch driver?
-    if (test_bit(ABS_MT_POSITION_X, device->absBitmask)
-            && test_bit(ABS_MT_POSITION_Y, device->absBitmask)) {
-        // Some joysticks such as the PS3 controller report axes that conflict
-        // with the ABS_MT range.  Try to confirm that the device really is
-        // a touch screen.
-        if (test_bit(BTN_TOUCH, device->keyBitmask) || !haveGamepadButtons) {
-            device->classes |= INPUT_DEVICE_CLASS_TOUCH | INPUT_DEVICE_CLASS_TOUCH_MT;
-        }
-    // Is this an old style single-touch driver?
-    } else if (test_bit(BTN_TOUCH, device->keyBitmask)
-            && test_bit(ABS_X, device->absBitmask)
-            && test_bit(ABS_Y, device->absBitmask)) {
-        device->classes |= INPUT_DEVICE_CLASS_TOUCH;
-    }
-
-    // See if this device is a joystick.
-    // Assumes that joysticks always have gamepad buttons in order to distinguish them
-    // from other devices such as accelerometers that also have absolute axes.
-    if (haveGamepadButtons) {
-        uint32_t assumedClasses = device->classes | INPUT_DEVICE_CLASS_JOYSTICK;
-        for (int i = 0; i <= ABS_MAX; i++) {
-            if (test_bit(i, device->absBitmask)
-                    && (getAbsAxisUsage(i, assumedClasses) & INPUT_DEVICE_CLASS_JOYSTICK)) {
-                device->classes = assumedClasses;
-                break;
-            }
-        }
-    }
-
-    // Check whether this device has switches.
-    for (int i = 0; i <= SW_MAX; i++) {
-        if (test_bit(i, device->swBitmask)) {
-            device->classes |= INPUT_DEVICE_CLASS_SWITCH;
-            break;
-        }
-    }
-
-    // Check whether this device supports the vibrator.
-    if (test_bit(FF_RUMBLE, device->ffBitmask)) {
-        device->classes |= INPUT_DEVICE_CLASS_VIBRATOR;
-    }
-
-    // Configure virtual keys.
-    if ((device->classes & INPUT_DEVICE_CLASS_TOUCH)) {
-        // Load the virtual keys for the touch screen, if any.
-        // We do this now so that we can make sure to load the keymap if necessary.
-        status_t status = loadVirtualKeyMapLocked(device);
-        if (!status) {
-            device->classes |= INPUT_DEVICE_CLASS_KEYBOARD;
-        }
-    }
-
-    // Load the key map.
-    // We need to do this for joysticks too because the key layout may specify axes.
-    status_t keyMapStatus = NAME_NOT_FOUND;
-    if (device->classes & (INPUT_DEVICE_CLASS_KEYBOARD | INPUT_DEVICE_CLASS_JOYSTICK)) {
-        // Load the keymap for the device.
-        keyMapStatus = loadKeyMapLocked(device);
-    }
-
-    // Configure the keyboard, gamepad or virtual keyboard.
-    if (device->classes & INPUT_DEVICE_CLASS_KEYBOARD) {
-        // Register the keyboard as a built-in keyboard if it is eligible.
-        if (!keyMapStatus
-                && mBuiltInKeyboardId == NO_BUILT_IN_KEYBOARD
-                && isEligibleBuiltInKeyboard(device->identifier,
-                        device->configuration, &device->keyMap)) {
-            mBuiltInKeyboardId = device->id;
-        }
-
-        // 'Q' key support = cheap test of whether this is an alpha-capable kbd
-        if (hasKeycodeLocked(device, AKEYCODE_Q)) {
-            device->classes |= INPUT_DEVICE_CLASS_ALPHAKEY;
-        }
-
-        // See if this device has a DPAD.
-        if (hasKeycodeLocked(device, AKEYCODE_DPAD_UP) &&
-                hasKeycodeLocked(device, AKEYCODE_DPAD_DOWN) &&
-                hasKeycodeLocked(device, AKEYCODE_DPAD_LEFT) &&
-                hasKeycodeLocked(device, AKEYCODE_DPAD_RIGHT) &&
-                hasKeycodeLocked(device, AKEYCODE_DPAD_CENTER)) {
-            device->classes |= INPUT_DEVICE_CLASS_DPAD;
-        }
-
-        // See if this device has a gamepad.
-        for (size_t i = 0; i < sizeof(GAMEPAD_KEYCODES)/sizeof(GAMEPAD_KEYCODES[0]); i++) {
-            if (hasKeycodeLocked(device, GAMEPAD_KEYCODES[i])) {
-                device->classes |= INPUT_DEVICE_CLASS_GAMEPAD;
-                break;
-            }
-        }
-    }
-
-    // If the device isn't recognized as something we handle, don't monitor it.
-    if (device->classes == 0) {
-        ALOGV("Dropping device: id=%d, path='%s', name='%s'",
-                deviceId, devicePath, c_str(device->identifier.name));
-        delete device;
-        return -1;
-    }
-
-    // Determine whether the device is external or internal.
-    if (isExternalDeviceLocked(device)) {
-        device->classes |= INPUT_DEVICE_CLASS_EXTERNAL;
-    }
-
-    // Register with epoll.
-    struct epoll_event eventItem;
-    memset(&eventItem, 0, sizeof(eventItem));
-    eventItem.events = EPOLLIN;
-    eventItem.data.u32 = deviceId;
-    if (epoll_ctl(mEpollFd, EPOLL_CTL_ADD, fd, &eventItem)) {
-        ALOGE("Could not add device fd to epoll instance.  errno=%d", errno);
-        delete device;
-        return -1;
-    }
-
-    // Enable wake-lock behavior on kernels that support it.
-    // TODO: Only need this for devices that can really wake the system.
-    bool usingSuspendBlockIoctl = !ioctl(fd, EVIOCSSUSPENDBLOCK, 1);
-
-    // Tell the kernel that we want to use the monotonic clock for reporting timestamps
-    // associated with input events.  This is important because the input system
-    // uses the timestamps extensively and assumes they were recorded using the monotonic
-    // clock.
-    //
-    // In older kernel, before Linux 3.4, there was no way to tell the kernel which
-    // clock to use to input event timestamps.  The standard kernel behavior was to
-    // record a real time timestamp, which isn't what we want.  Android kernels therefore
-    // contained a patch to the evdev_event() function in drivers/input/evdev.c to
-    // replace the call to do_gettimeofday() with ktime_get_ts() to cause the monotonic
-    // clock to be used instead of the real time clock.
-    //
-    // As of Linux 3.4, there is a new EVIOCSCLOCKID ioctl to set the desired clock.
-    // Therefore, we no longer require the Android-specific kernel patch described above
-    // as long as we make sure to set select the monotonic clock.  We do that here.
-    int clockId = CLOCK_MONOTONIC;
-    bool usingClockIoctl = !ioctl(fd, EVIOCSCLOCKID, &clockId);
-
-    ALOGI("New device: id=%d, fd=%d, path='%s', name='%s', classes=0x%x, "
-            "configuration='%s', keyLayout='%s', keyCharacterMap='%s', builtinKeyboard=%s, "
-            "usingSuspendBlockIoctl=%s, usingClockIoctl=%s",
-         deviceId, fd, devicePath, c_str(device->identifier.name),
-         device->classes,
-         c_str(device->configurationFile),
-         c_str(device->keyMap.keyLayoutFile),
-         c_str(device->keyMap.keyCharacterMapFile),
-         toString(mBuiltInKeyboardId == deviceId),
-         toString(usingSuspendBlockIoctl), toString(usingClockIoctl));
-
-    addDeviceLocked(device);
-    return 0;
-}
-
-void EventHub::createVirtualKeyboardLocked() {
-    InputDeviceIdentifier identifier;
-    identifier.name = "Virtual";
-    identifier.uniqueId = "<virtual>";
-    setDescriptor(identifier);
-
-    Device* device = new Device(-1, VIRTUAL_KEYBOARD_ID, String8("<virtual>"), identifier);
-    device->classes = INPUT_DEVICE_CLASS_KEYBOARD
-            | INPUT_DEVICE_CLASS_ALPHAKEY
-            | INPUT_DEVICE_CLASS_DPAD
-            | INPUT_DEVICE_CLASS_VIRTUAL;
-    loadKeyMapLocked(device);
-    addDeviceLocked(device);
-}
-
-void EventHub::addDeviceLocked(Device* device) {
-    mDevices.add(device->id, device);
-    device->next = mOpeningDevices;
-    mOpeningDevices = device;
-}
-
-void EventHub::loadConfigurationLocked(Device* device) {
-    device->configurationFile = getInputDeviceConfigurationFilePathByDeviceIdentifier(
-            device->identifier, INPUT_DEVICE_CONFIGURATION_FILE_TYPE_CONFIGURATION);
-    if (isEmpty(device->configurationFile)) {
-        ALOGD("No input device configuration file found for device '%s'.",
-            c_str(device->identifier.name));
-    } else {
-        status_t status = PropertyMap::load(device->configurationFile,
-                &device->configuration);
-        if (status) {
-            ALOGE("Error loading input device configuration file for device '%s'.  "
-                    "Using default configuration.",
-                    c_str(device->identifier.name));
-        }
-    }
-}
-
-status_t EventHub::loadVirtualKeyMapLocked(Device* device) {
-    // The virtual key map is supplied by the kernel as a system board property file.
-    String8 path;
-    path.append("/sys/board_properties/virtualkeys.");
-    path.append(device->identifier.name);
-    if (access(c_str(path), R_OK)) {
-        return NAME_NOT_FOUND;
-    }
-    return VirtualKeyMap::load(path, &device->virtualKeyMap);
-}
-
-status_t EventHub::loadKeyMapLocked(Device* device) {
-    // <mir changes>
-    status_t status = device->keyMap.load(device->identifier, device->configuration);
-    if (status) 
-        status = device->keyMap.loadGenericMaps();
-
-    return status;
-    // </mir changes>
-}
-
-bool EventHub::isExternalDeviceLocked(Device* device) {
-    if (device->configuration) {
-        bool value;
-        if (device->configuration->tryGetProperty(String8("device.internal"), value)) {
-            return !value;
-        }
-    }
-    return device->identifier.bus == BUS_USB || device->identifier.bus == BUS_BLUETOOTH;
-}
-
-bool EventHub::hasKeycodeLocked(Device* device, int keycode) const {
-    if (!device->keyMap.haveKeyLayout()) {
-        return false;
-    }
-    
-    Vector<int32_t> scanCodes;
-    device->keyMap.keyLayoutMap->findScanCodesForKey(keycode, &scanCodes);
-    const size_t N = scanCodes.size();
-    for (size_t i=0; i<N && i<=KEY_MAX; i++) {
-        int32_t sc = scanCodes.itemAt(i);
-        if (sc >= 0 && sc <= KEY_MAX && test_bit(sc, device->keyBitmask)) {
-            return true;
-        }
-    }
-    
-    return false;
-}
-
-status_t EventHub::closeDeviceByPathLocked(const char *devicePath) {
-    Device* device = getDeviceByPathLocked(devicePath);
-    if (device) {
-        closeDeviceLocked(device);
-        return 0;
-    }
-    ALOGV("Remove device: %s not found, device may already have been removed.", devicePath);
-    return -1;
-}
-
-void EventHub::closeAllDevicesLocked() {
-    while (mDevices.size() > 0) {
-        closeDeviceLocked(mDevices.valueAt(mDevices.size() - 1));
-    }
-}
-
-void EventHub::closeDeviceLocked(Device* device) {
-    ALOGI("Removed device: path=%s name=%s id=%d fd=%d classes=0x%x\n",
-        c_str(device->path), c_str(device->identifier.name), device->id,
-         device->fd, device->classes);
-
-    if (device->id == mBuiltInKeyboardId) {
-        ALOGW("built-in keyboard device %s (id=%d) is closing! the apps will not like this",
-            c_str(device->path), mBuiltInKeyboardId);
-        mBuiltInKeyboardId = NO_BUILT_IN_KEYBOARD;
-    }
-
-    if (!device->isVirtual()) {
-        if (epoll_ctl(mEpollFd, EPOLL_CTL_DEL, device->fd, NULL)) {
-            ALOGW("Could not remove device fd from epoll instance.  errno=%d", errno);
-        }
-    }
-
-    mDevices.removeItem(device->id);
-    device->close();
-
-    // Unlink for opening devices list if it is present.
-    Device* pred = NULL;
-    bool found = false;
-    for (Device* entry = mOpeningDevices; entry != NULL; ) {
-        if (entry == device) {
-            found = true;
-            break;
-        }
-        pred = entry;
-        entry = entry->next;
-    }
-    if (found) {
-        // Unlink the device from the opening devices list then delete it.
-        // We don't need to tell the client that the device was closed because
-        // it does not even know it was opened in the first place.
-        ALOGI("Device %s was immediately closed after opening.", c_str(device->path));
-        if (pred) {
-            pred->next = device->next;
-        } else {
-            mOpeningDevices = device->next;
-        }
-        delete device;
-    } else {
-        // Link into closing devices list.
-        // The device will be deleted later after we have informed the client.
-        device->next = mClosingDevices;
-        mClosingDevices = device;
-    }
-}
-
-void EventHub::requestReopenDevices() {
-    ALOGV("requestReopenDevices() called");
-
-    AutoMutex _l(mLock);
-    mNeedToReopenDevices = true;
-}
-
-void EventHub::dump(String8& dump) {
-    dump.append("Event Hub State:\n");
-
-    { // acquire lock
-        AutoMutex _l(mLock);
-
-        appendFormat(dump, INDENT "BuiltInKeyboardId: %d\n", mBuiltInKeyboardId);
-
-        dump.append(INDENT "Devices:\n");
-
-        for (size_t i = 0; i < mDevices.size(); i++) {
-            const Device* device = mDevices.valueAt(i);
-            if (mBuiltInKeyboardId == device->id) {
-                appendFormat(dump, INDENT2 "%d: %s (aka device 0 - built-in keyboard)\n",
-                        device->id, c_str(device->identifier.name));
-            } else {
-                appendFormat(dump, INDENT2 "%d: %s\n", device->id,
-                    c_str(device->identifier.name));
-            }
-            appendFormat(dump, INDENT3 "Classes: 0x%08x\n", device->classes);
-            appendFormat(dump, INDENT3 "Path: %s\n", c_str(device->path));
-            appendFormat(dump, INDENT3 "Descriptor: %s\n", c_str(device->identifier.descriptor));
-            appendFormat(dump, INDENT3 "Location: %s\n", c_str(device->identifier.location));
-            appendFormat(dump, INDENT3 "UniqueId: %s\n", c_str(device->identifier.uniqueId));
-            appendFormat(dump, INDENT3 "Identifier: bus=0x%04x, vendor=0x%04x, "
-                    "product=0x%04x, version=0x%04x\n",
-                    device->identifier.bus, device->identifier.vendor,
-                    device->identifier.product, device->identifier.version);
-            appendFormat(dump, INDENT3 "KeyLayoutFile: %s\n",
-                c_str(device->keyMap.keyLayoutFile));
-            appendFormat(dump, INDENT3 "KeyCharacterMapFile: %s\n",
-                c_str(device->keyMap.keyCharacterMapFile));
-            appendFormat(dump, INDENT3 "ConfigurationFile: %s\n",
-                c_str(device->configurationFile));
-            appendFormat(dump, INDENT3 "HaveKeyboardLayoutOverlay: %s\n",
-                    toString(device->overlayKeyMap != NULL));
-        }
-    } // release lock
-}
-
-void EventHub::monitor() {
-    // Acquire and release the lock to ensure that the event hub has not deadlocked.
-    mLock.lock();
-    mLock.unlock();
-}
-
-void EventHub::flush() {
-    static const int bufferSize = 256;
-
-    AutoMutex _l(mLock);
-
-    char readBuffer[bufferSize];
-    int32_t readSize;
-
-    // Read any pending events from the input devices. Note that
-    // the device fds are in non-blocking mode (see openDeviceLocked).
-    for (size_t i = 0; i < mDevices.size(); i++) {
-        const Device* device = mDevices.valueAt(i);
-        do {
-            readSize = read(device->fd, readBuffer, bufferSize);
-        } while (readSize > 0);
-    }
-}
-
-bool EventHub::hasDeviceByPathLocked(String8 const& path)
-{
-    for (size_t i = 0; i < mDevices.size(); i++) {
-        auto const& device = mDevices.valueAt(i);
-        if (device->path == path) return true;
-    }
-    return false;
-}
-
-mir::Fd EventHub::fd()
-{
-    return mEpollFd;
-}
-
-}; // namespace android

=== removed file '3rd_party/android-input/android/frameworks/base/services/input/EventHub.h'
--- 3rd_party/android-input/android/frameworks/base/services/input/EventHub.h	2015-06-17 05:20:42 +0000
+++ 3rd_party/android-input/android/frameworks/base/services/input/EventHub.h	1970-01-01 00:00:00 +0000
@@ -1,444 +0,0 @@
-/*
- * Copyright (C) 2005 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-//
-#ifndef _RUNTIME_EVENT_HUB_H
-#define _RUNTIME_EVENT_HUB_H
-
-#include <androidfw/Input.h>
-#include <androidfw/InputDevice.h>
-#include <androidfw/Keyboard.h>
-#include <androidfw/KeyLayoutMap.h>
-#include <androidfw/KeyCharacterMap.h>
-#include <androidfw/VirtualKeyMap.h>
-#include <std/String8.h>
-#include <std/Mutex.h>
-#include <std/List.h>
-#include <std/Errors.h>
-#include <std/PropertyMap.h>
-#include <std/Vector.h>
-#include <std/KeyedVector.h>
-
-#include "mir/fd.h"
-
-#include <linux/input.h>
-#include <sys/epoll.h>
-
-#include <memory>
-
-namespace mir
-{
-namespace udev { class Monitor; }
-namespace input
-{
-class InputReport;
-}
-}
-
-/* Convenience constants. */
-
-#define BTN_FIRST 0x100  // first button code
-#define BTN_LAST 0x15f   // last button code
-
-namespace android {
-
-enum {
-    // Device id of a special "virtual" keyboard that is always present.
-    VIRTUAL_KEYBOARD_ID = -1,
-    // Device id of the "built-in" keyboard if there is one.
-    BUILT_IN_KEYBOARD_ID = 0
-};
-
-/*
- * A raw event as retrieved from the EventHub.
- */
-struct RawEvent {
-    std::chrono::nanoseconds when;
-    int32_t deviceId;
-    int32_t type;
-    int32_t code;
-    int32_t value;
-};
-
-/* Describes an absolute axis. */
-struct RawAbsoluteAxisInfo {
-    bool valid; // true if the information is valid, false otherwise
-
-    int32_t minValue;  // minimum value
-    int32_t maxValue;  // maximum value
-    int32_t flat;      // center flat position, eg. flat == 8 means center is between -8 and 8
-    int32_t fuzz;      // error tolerance, eg. fuzz == 4 means value is +/- 4 due to noise
-    int32_t resolution; // resolution in units per mm or radians per mm
-
-    inline void clear() {
-        valid = false;
-        minValue = 0;
-        maxValue = 0;
-        flat = 0;
-        fuzz = 0;
-        resolution = 0;
-    }
-};
-
-/*
- * Input device classes.
- */
-enum {
-    /* The input device is a keyboard or has buttons. */
-    INPUT_DEVICE_CLASS_KEYBOARD      = 0x00000001,
-
-    /* The input device is an alpha-numeric keyboard (not just a dial pad). */
-    INPUT_DEVICE_CLASS_ALPHAKEY      = 0x00000002,
-
-    /* The input device is a touchscreen or a touchpad (either single-touch or multi-touch). */
-    INPUT_DEVICE_CLASS_TOUCH         = 0x00000004,
-
-    /* The input device is a cursor device such as a trackball or mouse. */
-    INPUT_DEVICE_CLASS_CURSOR        = 0x00000008,
-
-    /* The input device is a multi-touch touchscreen. */
-    INPUT_DEVICE_CLASS_TOUCH_MT      = 0x00000010,
-
-    /* The input device is a directional pad (implies keyboard, has DPAD keys). */
-    INPUT_DEVICE_CLASS_DPAD          = 0x00000020,
-
-    /* The input device is a gamepad (implies keyboard, has BUTTON keys). */
-    INPUT_DEVICE_CLASS_GAMEPAD       = 0x00000040,
-
-    /* The input device has switches. */
-    INPUT_DEVICE_CLASS_SWITCH        = 0x00000080,
-
-    /* The input device is a joystick (implies gamepad, has joystick absolute axes). */
-    INPUT_DEVICE_CLASS_JOYSTICK      = 0x00000100,
-
-    /* The input device has a vibrator (supports FF_RUMBLE). */
-    INPUT_DEVICE_CLASS_VIBRATOR      = 0x00000200,
-
-    /* The input device is virtual (not a real device, not part of UI configuration). */
-    INPUT_DEVICE_CLASS_VIRTUAL       = 0x40000000,
-
-    /* The input device is external (not built-in). */
-    INPUT_DEVICE_CLASS_EXTERNAL      = 0x80000000
-};
-
-/*
- * Gets the class that owns an axis, in cases where multiple classes might claim
- * the same axis for different purposes.
- */
-extern uint32_t getAbsAxisUsage(int32_t axis, uint32_t deviceClasses);
-
-/*
- * Grand Central Station for events.
- *
- * The event hub aggregates input events received across all known input
- * devices on the system, including devices that may be emulated by the simulator
- * environment.  In addition, the event hub generates fake input events to indicate
- * when devices are added or removed.
- *
- * The event hub provides a stream of input events (via the getEvent function).
- * It also supports querying the current actual state of input devices such as identifying
- * which keys are currently down.  Finally, the event hub keeps track of the capabilities of
- * individual input devices, such as their class and the set of key codes that they support.
- */
-class EventHubInterface : public virtual RefBase {
-protected:
-    EventHubInterface() { }
-    virtual ~EventHubInterface() { }
-
-public:
-    // Synthetic raw event type codes produced when devices are added or removed.
-    enum {
-        // Sent when a device is added.
-        DEVICE_ADDED = 0x10000000,
-        // Sent when a device is removed.
-        DEVICE_REMOVED = 0x20000000,
-        // Sent when all added/removed devices from the most recent scan have been reported.
-        // This event is always sent at least once.
-        FINISHED_DEVICE_SCAN = 0x30000000,
-
-        FIRST_SYNTHETIC_EVENT = DEVICE_ADDED
-    };
-
-    virtual uint32_t getDeviceClasses(int32_t deviceId) const = 0;
-
-    virtual InputDeviceIdentifier getDeviceIdentifier(int32_t deviceId) const = 0;
-
-    virtual void getConfiguration(int32_t deviceId, PropertyMap* outConfiguration) const = 0;
-
-    virtual status_t getAbsoluteAxisInfo(int32_t deviceId, int axis,
-            RawAbsoluteAxisInfo* outAxisInfo) const = 0;
-
-    virtual bool hasRelativeAxis(int32_t deviceId, int axis) const = 0;
-
-    virtual bool hasInputProperty(int32_t deviceId, int property) const = 0;
-
-    virtual status_t mapKey(int32_t deviceId, int32_t scanCode, int32_t usageCode,
-            int32_t* outKeycode, uint32_t* outFlags) const = 0;
-
-    virtual status_t mapAxis(int32_t deviceId, int32_t scanCode,
-            AxisInfo* outAxisInfo) const = 0;
-
-    // Sets devices that are excluded from opening.
-    // This can be used to ignore input devices for sensors.
-    virtual void setExcludedDevices(const Vector<String8>& devices) = 0;
-
-    /*
-     * Tests for available events and returns them.
-     * After returning, the EventHub holds onto a wake lock until the next call to getEvent.
-     * This ensures that the device will not go to sleep while the event is being processed.
-     * If the device needs to remain awake longer than that, then the caller is responsible
-     * for taking care of it (say, by poking the power manager user activity timer).
-     *
-     * Returns the number of events obtained.
-     */
-    virtual size_t getEvents(RawEvent* buffer, size_t bufferSize) = 0;
-
-    /*
-     * Query current input state.
-     */
-    virtual int32_t getScanCodeState(int32_t deviceId, int32_t scanCode) const = 0;
-    virtual int32_t getKeyCodeState(int32_t deviceId, int32_t keyCode) const = 0;
-    virtual int32_t getSwitchState(int32_t deviceId, int32_t sw) const = 0;
-    virtual status_t getAbsoluteAxisValue(int32_t deviceId, int32_t axis,
-            int32_t* outValue) const = 0;
-
-    /*
-     * Examine key input devices for specific framework keycode support
-     */
-    virtual bool markSupportedKeyCodes(int32_t deviceId, size_t numCodes, const int32_t* keyCodes,
-            uint8_t* outFlags) const = 0;
-
-    virtual bool hasScanCode(int32_t deviceId, int32_t scanCode) const = 0;
-    virtual bool hasLed(int32_t deviceId, int32_t led) const = 0;
-    virtual void setLedState(int32_t deviceId, int32_t led, bool on) = 0;
-
-    virtual void getVirtualKeyDefinitions(int32_t deviceId,
-            Vector<VirtualKeyDefinition>& outVirtualKeys) const = 0;
-
-    virtual sp<KeyCharacterMap> getKeyCharacterMap(int32_t deviceId) const = 0;
-    virtual bool setKeyboardLayoutOverlay(int32_t deviceId, const sp<KeyCharacterMap>& map) = 0;
-
-    /* Control the vibrator. */
-    virtual void vibrate(int32_t deviceId, std::chrono::nanoseconds duration) = 0;
-    virtual void cancelVibrate(int32_t deviceId) = 0;
-
-    /* Requests the EventHub to reopen all input devices on the next call to getEvents(). */
-    virtual void requestReopenDevices() = 0;
-
-    /* Wakes up getEvents() if it is blocked on a read. */
-    virtual void wake() = 0;
-
-    /* Ensures that fd() readable after given timeout */
-    virtual void wakeIn(int32_t timeout) = 0;
-
-    /* Dump EventHub state to a string. */
-    virtual void dump(String8& dump) = 0;
-
-    /* Called by the heatbeat to ensures that the reader has not deadlocked. */
-    virtual void monitor() = 0;
-
-    /* Flush all pending events not yet read from the input devices */
-    virtual void flush() = 0;
-
-    /* Epoll fd used by EventHub */
-    virtual mir::Fd fd() = 0;
-};
-
-class EventHub : public EventHubInterface
-{
-public:
-    EventHub(std::shared_ptr<mir::input::InputReport> const& input_report);
-
-    virtual uint32_t getDeviceClasses(int32_t deviceId) const;
-
-    virtual InputDeviceIdentifier getDeviceIdentifier(int32_t deviceId) const;
-
-    virtual void getConfiguration(int32_t deviceId, PropertyMap* outConfiguration) const;
-
-    virtual status_t getAbsoluteAxisInfo(int32_t deviceId, int axis,
-            RawAbsoluteAxisInfo* outAxisInfo) const;
-
-    virtual bool hasRelativeAxis(int32_t deviceId, int axis) const;
-
-    virtual bool hasInputProperty(int32_t deviceId, int property) const;
-
-    virtual status_t mapKey(int32_t deviceId, int32_t scanCode, int32_t usageCode,
-            int32_t* outKeycode, uint32_t* outFlags) const;
-
-    virtual status_t mapAxis(int32_t deviceId, int32_t scanCode,
-            AxisInfo* outAxisInfo) const;
-
-    virtual void setExcludedDevices(const Vector<String8>& devices);
-
-    virtual int32_t getScanCodeState(int32_t deviceId, int32_t scanCode) const;
-    virtual int32_t getKeyCodeState(int32_t deviceId, int32_t keyCode) const;
-    virtual int32_t getSwitchState(int32_t deviceId, int32_t sw) const;
-    virtual status_t getAbsoluteAxisValue(int32_t deviceId, int32_t axis, int32_t* outValue) const;
-
-    virtual bool markSupportedKeyCodes(int32_t deviceId, size_t numCodes,
-            const int32_t* keyCodes, uint8_t* outFlags) const;
-
-    virtual size_t getEvents(RawEvent* buffer, size_t bufferSize);
-
-    virtual bool hasScanCode(int32_t deviceId, int32_t scanCode) const;
-    virtual bool hasLed(int32_t deviceId, int32_t led) const;
-    virtual void setLedState(int32_t deviceId, int32_t led, bool on);
-
-    virtual void getVirtualKeyDefinitions(int32_t deviceId,
-            Vector<VirtualKeyDefinition>& outVirtualKeys) const;
-
-    virtual sp<KeyCharacterMap> getKeyCharacterMap(int32_t deviceId) const;
-    virtual bool setKeyboardLayoutOverlay(int32_t deviceId, const sp<KeyCharacterMap>& map);
-
-    virtual void vibrate(int32_t deviceId, std::chrono::nanoseconds duration);
-    virtual void cancelVibrate(int32_t deviceId);
-
-    virtual void requestReopenDevices();
-
-    virtual void wake();
-    virtual void wakeIn(int32_t timeout);
-
-    virtual void dump(String8& dump);
-    virtual void monitor();
-    virtual void flush();
-    virtual mir::Fd fd();
-
-    virtual ~EventHub();
-
-    // Ids used for epoll notifications not associated with devices.
-    static const uint32_t EPOLL_ID_UDEV = 0x80000001;
-    static const uint32_t EPOLL_ID_WAKE = 0x80000002;
-    static const uint32_t EPOLL_ID_TIMER = 0x80000003;
-private:
-    std::shared_ptr<mir::input::InputReport> const input_report;
-
-    struct Device {
-        Device* next;
-
-        int fd; // may be -1 if device is virtual
-        const int32_t id;
-        const String8 path;
-        const InputDeviceIdentifier identifier;
-
-        uint32_t classes;
-
-        uint8_t keyBitmask[(KEY_MAX + 1) / 8];
-        uint8_t absBitmask[(ABS_MAX + 1) / 8];
-        uint8_t relBitmask[(REL_MAX + 1) / 8];
-        uint8_t swBitmask[(SW_MAX + 1) / 8];
-        uint8_t ledBitmask[(LED_MAX + 1) / 8];
-        uint8_t ffBitmask[(FF_MAX + 1) / 8];
-        uint8_t propBitmask[(INPUT_PROP_MAX + 1) / 8];
-
-        String8 configurationFile;
-        PropertyMap* configuration;
-        VirtualKeyMap* virtualKeyMap;
-        KeyMap keyMap;
-
-        sp<KeyCharacterMap> overlayKeyMap;
-        sp<KeyCharacterMap> combinedKeyMap;
-
-        bool ffEffectPlaying;
-        int16_t ffEffectId; // initially -1
-
-        Device(int fd, int32_t id, const String8& path, const InputDeviceIdentifier& identifier);
-        ~Device();
-
-        void close();
-
-        inline bool isVirtual() const { return fd < 0; }
-
-        const sp<KeyCharacterMap>& getKeyCharacterMap() const {
-            if (combinedKeyMap != NULL) {
-                return combinedKeyMap;
-            }
-            return keyMap.keyCharacterMap;
-        }
-    };
-
-    status_t openDeviceLocked(const char *devicePath);
-    void createVirtualKeyboardLocked();
-    void addDeviceLocked(Device* device);
-
-    status_t closeDeviceByPathLocked(const char *devicePath);
-    void closeDeviceLocked(Device* device);
-    void closeAllDevicesLocked();
-
-    void scanDevicesLocked();
-    void handleUdevEventsLocked();
-
-    Device* getDeviceLocked(int32_t deviceId) const;
-    Device* getDeviceByPathLocked(const char* devicePath) const;
-
-    bool hasKeycodeLocked(Device* device, int keycode) const;
-
-    void loadConfigurationLocked(Device* device);
-    status_t loadVirtualKeyMapLocked(Device* device);
-    status_t loadKeyMapLocked(Device* device);
-
-    bool isExternalDeviceLocked(Device* device);
-
-    // Protect all internal state.
-    mutable Mutex mLock;
-
-    // The actual id of the built-in keyboard, or NO_BUILT_IN_KEYBOARD if none.
-    // EventHub remaps the built-in keyboard to id 0 externally as required by the API.
-    enum {
-        // Must not conflict with any other assigned device ids, including
-        // the virtual keyboard id (-1).
-        NO_BUILT_IN_KEYBOARD = -2
-    };
-    int32_t mBuiltInKeyboardId;
-
-    int32_t mNextDeviceId;
-
-    bool hasDeviceByPathLocked(String8 const& path);
-    KeyedVector<int32_t, Device*> mDevices;
-
-    Device *mOpeningDevices;
-    Device *mClosingDevices;
-
-    bool mNeedToSendFinishedDeviceScan;
-    bool mNeedToReopenDevices;
-    bool mNeedToScanDevices;
-    Vector<String8> mExcludedDevices;
-
-    mir::Fd mEpollFd;
-    mir::Fd mTimerFd;
-    std::unique_ptr<mir::udev::Monitor> const device_listener;
-    int mWakeReadPipeFd;
-    int mWakeWritePipeFd;
-
-    // Epoll FD list size hint.
-    static const int EPOLL_SIZE_HINT = 8;
-
-    // Maximum number of signalled FDs to handle at a time.
-    static const int EPOLL_MAX_EVENTS = 16;
-
-    // The array of pending epoll events and the index of the next event to be handled.
-    struct epoll_event mPendingEventItems[EPOLL_MAX_EVENTS];
-    size_t mPendingEventCount;
-    size_t mPendingEventIndex;
-    bool mPendingUdevEvent;
-};
-
-// Made available to test
-namespace detail { String8 sha1(const String8& in); }
-
-
-} // namespace android
-
-#endif // _RUNTIME_EVENT_HUB_H

=== removed file '3rd_party/android-input/android/frameworks/base/services/input/GenericKeyMap.cpp'
--- 3rd_party/android-input/android/frameworks/base/services/input/GenericKeyMap.cpp	2013-02-05 17:19:57 +0000
+++ 3rd_party/android-input/android/frameworks/base/services/input/GenericKeyMap.cpp	1970-01-01 00:00:00 +0000
@@ -1,1009 +0,0 @@
-// Copyright (C) 2010 The Android Open Source Project
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-
-#include <androidfw/GenericKeyMap.h>
-
-const char* android::GenericKeyMap::key_layout_contents()
-{
-    static const char* result = 
-            "key 1     ESCAPE\n"                \
-            "key 2     1\n"                     \
-            "key 3     2\n"                     \
-            "key 4     3\n"                     \
-            "key 5     4\n"                     \
-            "key 6     5\n"                     \
-            "key 7     6\n"                     \
-            "key 8     7\n"                     \
-            "key 9     8\n"                     \
-            "key 10    9\n"                     \
-            "key 11    0\n"                     \
-            "key 12    MINUS\n"                 \
-            "key 13    EQUALS\n"                \
-            "key 14    DEL\n"                   \
-            "key 15    TAB\n"                   \
-            "key 16    Q\n"                     \
-            "key 17    W\n"                     \
-            "key 18    E\n"                     \
-            "key 19    R\n"                     \
-            "key 20    T\n"                     \
-            "key 21    Y\n"                     \
-            "key 22    U\n"                     \
-            "key 23    I\n"                     \
-            "key 24    O\n"                     \
-            "key 25    P\n"                     \
-            "key 26    LEFT_BRACKET\n"          \
-            "key 27    RIGHT_BRACKET\n"         \
-            "key 28    ENTER\n"                 \
-            "key 29    CTRL_LEFT\n"             \
-            "key 30    A\n"                     \
-            "key 31    S\n"                     \
-            "key 32    D\n"                     \
-            "key 33    F\n"                     \
-            "key 34    G\n" \
-            "key 35    H\n" \
-            "key 36    J\n" \
-            "key 37    K\n" \
-            "key 38    L\n" \
-            "key 39    SEMICOLON\n" \
-            "key 40    APOSTROPHE\n" \
-            "key 41    GRAVE\n" \
-            "key 42    SHIFT_LEFT\n" \
-            "key 43    BACKSLASH\n" \
-            "key 44    Z\n" \
-            "key 45    X\n" \
-            "key 46    C\n" \
-            "key 47    V\n" \
-            "key 48    B\n" \
-            "key 49    N\n" \
-            "key 50    M\n" \
-            "key 51    COMMA\n" \
-            "key 52    PERIOD\n" \
-            "key 53    SLASH\n" \
-            "key 54    SHIFT_RIGHT\n" \
-            "key 55    NUMPAD_MULTIPLY\n" \
-            "key 56    ALT_LEFT\n" \
-            "key 57    SPACE\n" \
-            "key 58    CAPS_LOCK\n" \
-            "key 59    F1\n" \
-            "key 60    F2\n" \
-            "key 61    F3\n" \
-            "key 62    F4\n" \
-            "key 63    F5\n" \
-            "key 64    F6\n" \
-            "key 65    F7\n" \
-            "key 66    F8\n" \
-            "key 67    F9\n" \
-            "key 68    F10\n" \
-            "key 69    NUM_LOCK\n" \
-            "key 70    SCROLL_LOCK\n" \
-            "key 71    NUMPAD_7\n" \
-            "key 72    NUMPAD_8\n" \
-            "key 73    NUMPAD_9\n" \
-            "key 74    NUMPAD_SUBTRACT\n" \
-            "key 75    NUMPAD_4\n" \
-            "key 76    NUMPAD_5\n" \
-            "key 77    NUMPAD_6\n" \
-            "key 78    NUMPAD_ADD\n" \
-            "key 79    NUMPAD_1\n" \
-            "key 80    NUMPAD_2\n" \
-            "key 81    NUMPAD_3\n" \
-            "key 82    NUMPAD_0\n" \
-            "key 83    NUMPAD_DOT\n" \
-            "# key 84 (undefined)\n" \
-            "key 85    ZENKAKU_HANKAKU\n" \
-            "key 86    BACKSLASH\n" \
-            "key 87    F11\n" \
-            "key 88    F12\n" \
-            "key 89    RO\n" \
-            "# key 90 \"KEY_KATAKANA\"\n" \
-            "# key 91 \"KEY_HIRAGANA\"\n" \
-            "key 92    HENKAN\n" \
-            "key 93    KATAKANA_HIRAGANA\n" \
-            "key 94    MUHENKAN\n" \
-            "key 95    NUMPAD_COMMA\n" \
-            "key 96    NUMPAD_ENTER\n" \
-            "key 97    CTRL_RIGHT\n" \
-            "key 98    NUMPAD_DIVIDE\n" \
-            "key 99    SYSRQ\n" \
-            "key 100   ALT_RIGHT\n" \
-            "# key 101 \"KEY_LINEFEED\"\n" \
-            "key 102   MOVE_HOME\n" \
-            "key 103   DPAD_UP\n" \
-            "key 104   PAGE_UP\n" \
-            "key 105   DPAD_LEFT\n" \
-            "key 106   DPAD_RIGHT\n" \
-            "key 107   MOVE_END\n" \
-            "key 108   DPAD_DOWN\n" \
-            "key 109   PAGE_DOWN\n" \
-            "key 110   INSERT\n" \
-            "key 111   FORWARD_DEL\n" \
-            "# key 112 \"KEY_MACRO\"\n" \
-            "key 113   VOLUME_MUTE\n" \
-            "key 114   VOLUME_DOWN\n" \
-            "key 115   VOLUME_UP\n" \
-            "key 116   POWER             WAKE\n" \
-            "key 117   NUMPAD_EQUALS\n" \
-            "# key 118 \"KEY_KPPLUSMINUS\"\n" \
-            "key 119   BREAK\n" \
-            "# key 120 (undefined)\n" \
-            "key 121   NUMPAD_COMMA\n" \
-            "key 122   KANA\n" \
-            "key 123   EISU\n" \
-            "key 124   YEN\n" \
-            "key 125   META_LEFT\n" \
-            "key 126   META_RIGHT\n" \
-            "key 127   MENU              WAKE_DROPPED\n" \
-            "key 128   MEDIA_STOP\n" \
-            "# key 129 \"KEY_AGAIN\"\n" \
-            "# key 130 \"KEY_PROPS\"\n" \
-            "# key 131 \"KEY_UNDO\"\n" \
-            "# key 132 \"KEY_FRONT\"\n" \
-            "# key 133 \"KEY_COPY\"\n" \
-            "# key 134 \"KEY_OPEN\"\n" \
-            "# key 135 \"KEY_PASTE\"\n" \
-            "# key 136 \"KEY_FIND\"\n" \
-            "# key 137 \"KEY_CUT\"\n" \
-            "# key 138 \"KEY_HELP\"\n" \
-            "key 139   MENU              WAKE_DROPPED\n" \
-            "key 140   CALCULATOR\n" \
-            "# key 141 \"KEY_SETUP\"\n" \
-            "key 142   POWER             WAKE\n" \
-            "key 143   POWER             WAKE\n" \
-            "# key 144 \"KEY_FILE\"\n" \
-            "# key 145 \"KEY_SENDFILE\"\n" \
-            "# key 146 \"KEY_DELETEFILE\"\n" \
-            "# key 147 \"KEY_XFER\"\n" \
-            "# key 148 \"KEY_PROG1\"\n" \
-            "# key 149 \"KEY_PROG2\"\n" \
-            "key 150   EXPLORER\n" \
-            "# key 151 \"KEY_MSDOS\"\n" \
-            "key 152   POWER             WAKE\n" \
-            "# key 153 \"KEY_DIRECTION\"\n" \
-            "# key 154 \"KEY_CYCLEWINDOWS\"\n" \
-            "key 155   ENVELOPE\n" \
-            "key 156   BOOKMARK\n" \
-            "# key 157 \"KEY_COMPUTER\"\n" \
-            "key 158   BACK              WAKE_DROPPED\n" \
-            "key 159   FORWARD\n" \
-            "key 160   MEDIA_CLOSE\n" \
-            "key 161   MEDIA_EJECT\n" \
-            "key 162   MEDIA_EJECT\n" \
-            "key 163   MEDIA_NEXT\n" \
-            "key 164   MEDIA_PLAY_PAUSE\n" \
-            "key 165   MEDIA_PREVIOUS\n" \
-            "key 166   MEDIA_STOP\n" \
-            "key 167   MEDIA_RECORD\n" \
-            "key 168   MEDIA_REWIND\n" \
-            "key 169   CALL\n" \
-            "# key 170 \"KEY_ISO\"\n" \
-            "key 171   MUSIC\n" \
-            "key 172   HOME\n" \
-            "# key 173 \"KEY_REFRESH\"\n" \
-            "# key 174 \"KEY_EXIT\"\n" \
-            "# key 175 \"KEY_MOVE\"\n" \
-            "# key 176 \"KEY_EDIT\"\n" \
-            "key 177   PAGE_UP\n" \
-            "key 178   PAGE_DOWN\n" \
-            "key 179   NUMPAD_LEFT_PAREN\n" \
-            "key 180   NUMPAD_RIGHT_PAREN\n" \
-            "# key 181 \"KEY_NEW\"\n" \
-            "# key 182 \"KEY_REDO\"\n" \
-            "# key 183   F13\n" \
-            "# key 184   F14\n" \
-            "# key 185   F15\n" \
-            "# key 186   F16\n" \
-            "# key 187   F17\n" \
-            "# key 188   F18\n" \
-            "# key 189   F19\n" \
-            "# key 190   F20\n" \
-            "# key 191   F21\n" \
-            "# key 192   F22\n" \
-            "# key 193   F23\n" \
-            "# key 194   F24\n" \
-            "# key 195 (undefined)\n" \
-            "# key 196 (undefined)\n" \
-            "# key 197 (undefined)\n" \
-            "# key 198 (undefined)\n" \
-            "# key 199 (undefined)\n" \
-            "key 200   MEDIA_PLAY\n" \
-            "key 201   MEDIA_PAUSE\n" \
-            "# key 202 \"KEY_PROG3\"\n" \
-            "# key 203 \"KEY_PROG4\"\n" \
-            "# key 204 (undefined)\n" \
-            "# key 205 \"KEY_SUSPEND\"\n" \
-            "# key 206 \"KEY_CLOSE\"\n" \
-            "key 207   MEDIA_PLAY\n" \
-            "key 208   MEDIA_FAST_FORWARD\n" \
-            "# key 209 \"KEY_BASSBOOST\"\n" \
-            "# key 210 \"KEY_PRINT\"\n" \
-            "# key 211 \"KEY_HP\"\n" \
-            "key 212   CAMERA\n" \
-            "key 213   MUSIC\n" \
-            "# key 214 \"KEY_QUESTION\"\n" \
-            "key 215   ENVELOPE\n" \
-            "# key 216 \"KEY_CHAT\"\n" \
-            "key 217   SEARCH\n" \
-            "# key 218 \"KEY_CONNECT\"\n" \
-            "# key 219 \"KEY_FINANCE\"\n" \
-            "# key 220 \"KEY_SPORT\"\n" \
-            "# key 221 \"KEY_SHOP\"\n" \
-            "# key 222 \"KEY_ALTERASE\"\n" \
-            "# key 223 \"KEY_CANCEL\"\n" \
-            "# key 224 \"KEY_BRIGHTNESSDOWN\"\n" \
-            "# key 225 \"KEY_BRIGHTNESSUP\"\n" \
-            "key 226   HEADSETHOOK\n" \
-            "\n" \
-            "key 256   BUTTON_1\n" \
-            "key 257   BUTTON_2\n" \
-            "key 258   BUTTON_3\n" \
-            "key 259   BUTTON_4\n" \
-            "key 260   BUTTON_5\n" \
-            "key 261   BUTTON_6\n" \
-            "key 262   BUTTON_7\n" \
-            "key 263   BUTTON_8\n" \
-            "key 264   BUTTON_9\n" \
-            "key 265   BUTTON_10\n" \
-            "key 266   BUTTON_11\n" \
-            "key 267   BUTTON_12\n" \
-            "key 268   BUTTON_13\n" \
-            "key 269   BUTTON_14\n" \
-            "key 270   BUTTON_15\n" \
-            "key 271   BUTTON_16\n" \
-            "\n" \
-            "key 288   BUTTON_1\n" \
-            "key 289   BUTTON_2\n" \
-            "key 290   BUTTON_3\n" \
-            "key 291   BUTTON_4\n" \
-            "key 292   BUTTON_5\n" \
-            "key 293   BUTTON_6\n" \
-            "key 294   BUTTON_7\n" \
-            "key 295   BUTTON_8\n" \
-            "key 296   BUTTON_9\n" \
-            "key 297   BUTTON_10\n" \
-            "key 298   BUTTON_11\n" \
-            "key 299   BUTTON_12\n" \
-            "key 300   BUTTON_13\n" \
-            "key 301   BUTTON_14\n" \
-            "key 302   BUTTON_15\n" \
-            "key 303   BUTTON_16\n" \
-            "\n" \
-            "\n" \
-            "key 304   BUTTON_A\n" \
-            "key 305   BUTTON_B\n" \
-            "key 306   BUTTON_C\n" \
-            "key 307   BUTTON_X\n" \
-            "key 308   BUTTON_Y\n" \
-            "key 309   BUTTON_Z\n" \
-            "key 310   BUTTON_L1\n" \
-            "key 311   BUTTON_R1\n" \
-            "key 312   BUTTON_L2\n" \
-            "key 313   BUTTON_R2\n" \
-            "key 314   BUTTON_SELECT\n" \
-            "key 315   BUTTON_START\n" \
-            "key 316   BUTTON_MODE\n" \
-            "key 317   BUTTON_THUMBL\n" \
-            "key 318   BUTTON_THUMBR\n" \
-            "\n" \
-            "\n" \
-            "# key 352 \"KEY_OK\"\n" \
-            "key 353   DPAD_CENTER\n" \
-            "# key 354 \"KEY_GOTO\"\n" \
-            "# key 355 \"KEY_CLEAR\"\n" \
-            "# key 356 \"KEY_POWER2\"\n" \
-            "# key 357 \"KEY_OPTION\"\n" \
-            "# key 358 \"KEY_INFO\"\n" \
-            "# key 359 \"KEY_TIME\"\n" \
-            "# key 360 \"KEY_VENDOR\"\n" \
-            "# key 361 \"KEY_ARCHIVE\"\n" \
-            "key 362   GUIDE\n" \
-            "# key 363 \"KEY_CHANNEL\"\n" \
-            "# key 364 \"KEY_FAVORITES\"\n" \
-            "# key 365 \"KEY_EPG\"\n" \
-            "key 366   DVR\n" \
-            "# key 367 \"KEY_MHP\"\n" \
-            "# key 368 \"KEY_LANGUAGE\"\n" \
-            "# key 369 \"KEY_TITLE\"\n" \
-            "# key 370 \"KEY_SUBTITLE\"\n" \
-            "# key 371 \"KEY_ANGLE\"\n" \
-            "# key 372 \"KEY_ZOOM\"\n" \
-            "# key 373 \"KEY_MODE\"\n" \
-            "# key 374 \"KEY_KEYBOARD\"\n" \
-            "# key 375 \"KEY_SCREEN\"\n" \
-            "# key 376 \"KEY_PC\"\n" \
-            "key 377   TV\n" \
-            "# key 378 \"KEY_TV2\"\n" \
-            "# key 379 \"KEY_VCR\"\n" \
-            "# key 380 \"KEY_VCR2\"\n" \
-            "# key 381 \"KEY_SAT\"\n" \
-            "# key 382 \"KEY_SAT2\"\n" \
-            "# key 383 \"KEY_CD\"\n" \
-            "# key 384 \"KEY_TAPE\"\n" \
-            "# key 385 \"KEY_RADIO\"\n" \
-            "# key 386 \"KEY_TUNER\"\n" \
-            "# key 387 \"KEY_PLAYER\"\n" \
-            "# key 388 \"KEY_TEXT\"\n" \
-            "# key 389 \"KEY_DVD\"\n" \
-            "# key 390 \"KEY_AUX\"\n" \
-            "# key 391 \"KEY_MP3\"\n" \
-            "# key 392 \"KEY_AUDIO\"\n" \
-            "# key 393 \"KEY_VIDEO\"\n" \
-            "# key 394 \"KEY_DIRECTORY\"\n" \
-            "# key 395 \"KEY_LIST\"\n" \
-            "# key 396 \"KEY_MEMO\"\n" \
-            "key 397   CALENDAR\n" \
-            "# key 398 \"KEY_RED\"\n" \
-            "# key 399 \"KEY_GREEN\"\n" \
-            "# key 400 \"KEY_YELLOW\"\n" \
-            "# key 401 \"KEY_BLUE\"\n" \
-            "key 402   CHANNEL_UP\n" \
-            "key 403   CHANNEL_DOWN\n" \
-            "# key 404 \"KEY_FIRST\"\n" \
-            "# key 405 \"KEY_LAST\"\n" \
-            "# key 406 \"KEY_AB\"\n" \
-            "# key 407 \"KEY_NEXT\"\n" \
-            "# key 408 \"KEY_RESTART\"\n" \
-            "# key 409 \"KEY_SLOW\"\n" \
-            "# key 410 \"KEY_SHUFFLE\"\n" \
-            "# key 411 \"KEY_BREAK\"\n" \
-            "# key 412 \"KEY_PREVIOUS\"\n" \
-            "# key 413 \"KEY_DIGITS\"\n" \
-            "# key 414 \"KEY_TEEN\"\n" \
-            "# key 415 \"KEY_TWEN\"\n" \
-            "key 429   CONTACTS\n" \
-            "\n" \
-            "# key 448 \"KEY_DEL_EOL\"\n" \
-            "# key 449 \"KEY_DEL_EOS\"\n" \
-            "# key 450 \"KEY_INS_LINE\"\n" \
-            "# key 451 \"KEY_DEL_LINE\"\n" \
-            "\n" \
-            "\n" \
-            "key 464   FUNCTION\n" \
-            "key 465   ESCAPE            FUNCTION\n" \
-            "key 466   F1                FUNCTION\n" \
-            "key 467   F2                FUNCTION\n" \
-            "key 468   F3                FUNCTION\n" \
-            "key 469   F4                FUNCTION\n" \
-            "key 470   F5                FUNCTION\n" \
-            "key 471   F6                FUNCTION\n" \
-            "key 472   F7                FUNCTION\n" \
-            "key 473   F8                FUNCTION\n" \
-            "key 474   F9                FUNCTION\n" \
-            "key 475   F10               FUNCTION\n" \
-            "key 476   F11               FUNCTION\n" \
-            "key 477   F12               FUNCTION\n" \
-            "key 478   1                 FUNCTION\n" \
-            "key 479   2                 FUNCTION\n" \
-            "key 480   D                 FUNCTION\n" \
-            "key 481   E                 FUNCTION\n" \
-            "key 482   F                 FUNCTION\n" \
-            "key 483   S                 FUNCTION\n" \
-            "key 484   B                 FUNCTION\n" \
-            "\n" \
-            "\n" \
-            "# key 497 KEY_BRL_DOT1\n" \
-            "# key 498 KEY_BRL_DOT2\n" \
-            "# key 499 KEY_BRL_DOT3\n" \
-            "# key 500 KEY_BRL_DOT4\n" \
-            "# key 501 KEY_BRL_DOT5\n" \
-            "# key 502 KEY_BRL_DOT6\n" \
-            "# key 503 KEY_BRL_DOT7\n" \
-            "# key 504 KEY_BRL_DOT8\n" \
-            "\n" \
-            "\n" \
-            "# Joystick and game controller axes.\n" \
-            "# Axes that are not mapped will be assigned generic axis numbers by the input subsystem.\n" \
-            "axis 0x00 X\n" \
-            "axis 0x01 Y\n" \
-            "axis 0x02 Z\n" \
-            "axis 0x03 RX\n" \
-            "axis 0x04 RY\n" \
-            "axis 0x05 RZ\n" \
-            "axis 0x06 THROTTLE\n" \
-            "axis 0x07 RUDDER\n" \
-            "axis 0x08 WHEEL\n" \
-            "axis 0x09 GAS\n" \
-            "axis 0x0a BRAKE\n" \
-            "axis 0x10 HAT_X\n" \
-            "axis 0x11 HAT_Y\n";
-    return result;
-}
-
-const char* android::GenericKeyMap::keymap_contents()
-{
-    static const char* result = 
-            "type FULL\n"                       \
-            "\n" \
-            "### Basic QWERTY keys ###\n" \
-            "\n" \
-            "key A {\n" \
-            "    label:                              'A'\n" \
-            "    base:                               'a'\n" \
-            "    shift, capslock:                    'A'\n" \
-            "}\n" \
-            "\n" \
-            "key B {\n" \
-            "    label:                              'B'\n" \
-            "    base:                               'b'\n" \
-            "    shift, capslock:                    'B'\n" \
-            "}\n" \
-            "\n" \
-            "key C {\n" \
-            "    label:                              'C'\n" \
-            "    base:                               'c'\n" \
-            "    shift, capslock:                    'C'\n" \
-            "    alt:                                '\\u00e7'\n" \
-            "    shift+alt:                          '\\u00c7'\n" \
-            "}\n" \
-            "\n" \
-            "key D {\n" \
-            "    label:                              'D'\n" \
-            "    base:                               'd'\n" \
-            "    shift, capslock:                    'D'\n" \
-            "}\n" \
-            "\n" \
-            "key E {\n" \
-            "    label:                              'E'\n" \
-            "    base:                               'e'\n" \
-            "    shift, capslock:                    'E'\n" \
-            "    alt:                                '\\u0301'\n" \
-            "}\n" \
-            "\n" \
-            "key F {\n" \
-            "    label:                              'F'\n" \
-            "    base:                               'f'\n" \
-            "    shift, capslock:                    'F'\n" \
-            "}\n" \
-            "\n" \
-            "key G {\n" \
-            "    label:                              'G'\n" \
-            "    base:                               'g'\n" \
-            "    shift, capslock:                    'G'\n" \
-            "}\n" \
-            "\n" \
-            "key H {\n" \
-            "    label:                              'H'\n" \
-            "    base:                               'h'\n" \
-            "    shift, capslock:                    'H'\n" \
-            "}\n" \
-            "\n" \
-            "key I {\n" \
-            "    label:                              'I'\n" \
-            "    base:                               'i'\n" \
-            "    shift, capslock:                    'I'\n" \
-            "    alt:                                '\\u0302'\n" \
-            "}\n" \
-            "\n" \
-            "key J {\n" \
-            "    label:                              'J'\n" \
-            "    base:                               'j'\n" \
-            "    shift, capslock:                    'J'\n" \
-            "}\n" \
-            "\n" \
-            "key K {\n" \
-            "    label:                              'K'\n" \
-            "    base:                               'k'\n" \
-            "    shift, capslock:                    'K'\n" \
-            "}\n" \
-            "\n" \
-            "key L {\n" \
-            "    label:                              'L'\n" \
-            "    base:                               'l'\n" \
-            "    shift, capslock:                    'L'\n" \
-            "}\n" \
-            "\n" \
-            "key M {\n" \
-            "    label:                              'M'\n" \
-            "    base:                               'm'\n" \
-            "    shift, capslock:                    'M'\n" \
-            "}\n" \
-            "\n" \
-            "key N {\n" \
-            "    label:                              'N'\n" \
-            "    base:                               'n'\n" \
-            "    shift, capslock:                    'N'\n" \
-            "    alt:                                '\\u0303'\n" \
-            "}\n" \
-            "\n" \
-            "key O {\n" \
-            "    label:                              'O'\n" \
-            "    base:                               'o'\n" \
-            "    shift, capslock:                    'O'\n" \
-            "}\n" \
-            "\n" \
-            "key P {\n" \
-            "    label:                              'P'\n" \
-            "    base:                               'p'\n" \
-            "    shift, capslock:                    'P'\n" \
-            "}\n" \
-            "\n" \
-            "key Q {\n" \
-            "    label:                              'Q'\n" \
-            "    base:                               'q'\n" \
-            "    shift, capslock:                    'Q'\n" \
-            "}\n" \
-            "\n" \
-            "key R {\n" \
-            "    label:                              'R'\n" \
-            "    base:                               'r'\n" \
-            "    shift, capslock:                    'R'\n" \
-            "}\n" \
-            "\n" \
-            "key S {\n" \
-            "    label:                              'S'\n" \
-            "    base:                               's'\n" \
-            "    shift, capslock:                    'S'\n" \
-            "    alt:                                '\\u00df'\n" \
-            "}\n" \
-            "\n" \
-            "key T {\n" \
-            "    label:                              'T'\n" \
-            "    base:                               't'\n" \
-            "    shift, capslock:                    'T'\n" \
-            "}\n" \
-            "\n" \
-            "key U {\n" \
-            "    label:                              'U'\n" \
-            "    base:                               'u'\n" \
-            "    shift, capslock:                    'U'\n" \
-            "    alt:                                '\\u0308'\n" \
-            "}\n" \
-            "\n" \
-            "key V {\n" \
-            "    label:                              'V'\n" \
-            "    base:                               'v'\n" \
-            "    shift, capslock:                    'V'\n" \
-            "}\n" \
-            "\n" \
-            "key W {\n" \
-            "    label:                              'W'\n" \
-            "    base:                               'w'\n" \
-            "    shift, capslock:                    'W'\n" \
-            "}\n" \
-            "\n" \
-            "key X {\n" \
-            "    label:                              'X'\n" \
-            "    base:                               'x'\n" \
-            "    shift, capslock:                    'X'\n" \
-            "}\n" \
-            "\n" \
-            "key Y {\n" \
-            "    label:                              'Y'\n" \
-            "    base:                               'y'\n" \
-            "    shift, capslock:                    'Y'\n" \
-            "}\n" \
-            "\n" \
-            "key Z {\n" \
-            "    label:                              'Z'\n" \
-            "    base:                               'z'\n" \
-            "    shift, capslock:                    'Z'\n" \
-            "}\n" \
-            "\n" \
-            "key 0 {\n" \
-            "    label:                              '0'\n" \
-            "    base:                               '0'\n" \
-            "    shift:                              ')'\n" \
-            "}\n" \
-            "\n" \
-            "key 1 {\n" \
-            "    label:                              '1'\n" \
-            "    base:                               '1'\n" \
-            "    shift:                              '!'\n" \
-            "}\n" \
-            "\n" \
-            "key 2 {\n" \
-            "    label:                              '2'\n" \
-            "    base:                               '2'\n" \
-            "    shift:                              '@'\n" \
-            "}\n" \
-            "\n" \
-            "key 3 {\n" \
-            "    label:                              '3'\n" \
-            "    base:                               '3'\n" \
-            "    shift:                              '#'\n" \
-            "}\n" \
-            "\n" \
-            "key 4 {\n" \
-            "    label:                              '4'\n" \
-            "    base:                               '4'\n" \
-            "    shift:                              '$'\n" \
-            "}\n" \
-            "\n" \
-            "key 5 {\n" \
-            "    label:                              '5'\n" \
-            "    base:                               '5'\n" \
-            "    shift:                              '%'\n" \
-            "}\n" \
-            "\n" \
-            "key 6 {\n" \
-            "    label:                              '6'\n" \
-            "    base:                               '6'\n" \
-            "    shift:                              '^'\n" \
-            "    alt+shift:                          '\\u0302'\n" \
-            "}\n" \
-            "\n" \
-            "key 7 {\n" \
-            "    label:                              '7'\n" \
-            "    base:                               '7'\n" \
-            "    shift:                              '&'\n" \
-            "}\n" \
-            "\n" \
-            "key 8 {\n" \
-            "    label:                              '8'\n" \
-            "    base:                               '8'\n" \
-            "    shift:                              '*'\n" \
-            "}\n" \
-            "\n" \
-            "key 9 {\n" \
-            "    label:                              '9'\n" \
-            "    base:                               '9'\n" \
-            "    shift:                              '('\n" \
-            "}\n" \
-            "\n" \
-            "key SPACE {\n" \
-            "    label:                              ' '\n" \
-            "    base:                               ' '\n" \
-            "    alt, meta:                          fallback SEARCH\n" \
-            "    ctrl:                               fallback LANGUAGE_SWITCH\n" \
-            "}\n" \
-            "\n" \
-            "key ENTER {\n" \
-            "    label:                              '\\n'\n" \
-            "    base:                               '\\n'\n" \
-            "}\n" \
-            "\n" \
-            "key TAB {\n" \
-            "    label:                              '\\t'\n" \
-            "    base:                               '\\t'\n" \
-            "}\n" \
-            "\n" \
-            "key COMMA {\n" \
-            "    label:                              ','\n" \
-            "    base:                               ','\n" \
-            "    shift:                              '<'\n" \
-            "}\n" \
-            "\n" \
-            "key PERIOD {\n" \
-            "    label:                              '.'\n" \
-            "    base:                               '.'\n" \
-            "    shift:                              '>'\n" \
-            "}\n" \
-            "\n" \
-            "key SLASH {\n" \
-            "    label:                              '/'\n" \
-            "    base:                               '/'\n" \
-            "    shift:                              '?'\n" \
-            "}\n" \
-            "\n" \
-            "key GRAVE {\n" \
-            "    label:                              '`'\n" \
-            "    base:                               '`'\n" \
-            "    shift:                              '~'\n" \
-            "    alt:                                '\\u0300'\n" \
-            "    alt+shift:                          '\\u0303'\n" \
-            "}\n" \
-            "\n" \
-            "key MINUS {\n" \
-            "    label:                              '-'\n" \
-            "    base:                               '-'\n" \
-            "    shift:                              '_'\n" \
-            "}\n" \
-            "\n" \
-            "key EQUALS {\n" \
-            "    label:                              '='\n" \
-            "    base:                               '='\n" \
-            "    shift:                              '+'\n" \
-            "}\n" \
-            "\n" \
-            "key LEFT_BRACKET {\n" \
-            "    label:                              '['\n" \
-            "    base:                               '['\n" \
-            "    shift:                              '{'\n" \
-            "}\n" \
-            "\n" \
-            "key RIGHT_BRACKET {\n" \
-            "    label:                              ']'\n" \
-            "    base:                               ']'\n" \
-            "    shift:                              '}'\n" \
-            "}\n" \
-            "\n" \
-            "key BACKSLASH {\n" \
-            "    label:                              '\\\\'\n" \
-            "    base:                               '\\\\'\n" \
-            "    shift:                              '|'\n" \
-            "}\n" \
-            "\n" \
-            "key SEMICOLON {\n" \
-            "    label:                              ';'\n" \
-            "    base:                               ';'\n" \
-            "    shift:                              ':'\n" \
-            "}\n" \
-            "\n" \
-            "key APOSTROPHE {\n" \
-            "    label:                              '\\''\n" \
-            "    base:                               '\\''\n" \
-            "    shift:                              '\"'\n" \
-            "}\n" \
-            "\n" \
-            "### Numeric keypad ###\n" \
-            "\n" \
-            "key NUMPAD_0 {\n" \
-            "    label:                              '0'\n" \
-            "    base:                               fallback INSERT\n" \
-            "    numlock:                            '0'\n" \
-            "}\n" \
-            "\n" \
-            "key NUMPAD_1 {\n" \
-            "    label:                              '1'\n" \
-            "    base:                               fallback MOVE_END\n" \
-            "    numlock:                            '1'\n" \
-            "}\n" \
-            "\n" \
-            "key NUMPAD_2 {\n" \
-            "    label:                              '2'\n" \
-            "    base:                               fallback DPAD_DOWN\n" \
-            "    numlock:                            '2'\n" \
-            "}\n" \
-            "\n" \
-            "key NUMPAD_3 {\n" \
-            "    label:                              '3'\n" \
-            "    base:                               fallback PAGE_DOWN\n" \
-            "    numlock:                            '3'\n" \
-            "}\n" \
-            "\n" \
-            "key NUMPAD_4 {\n" \
-            "    label:                              '4'\n" \
-            "    base:                               fallback DPAD_LEFT\n" \
-            "    numlock:                            '4'\n" \
-            "}\n" \
-            "\n" \
-            "key NUMPAD_5 {\n" \
-            "    label:                              '5'\n" \
-            "    base:                               fallback DPAD_CENTER\n" \
-            "    numlock:                            '5'\n" \
-            "}\n" \
-            "\n" \
-            "key NUMPAD_6 {\n" \
-            "    label:                              '6'\n" \
-            "    base:                               fallback DPAD_RIGHT\n" \
-            "    numlock:                            '6'\n" \
-            "}\n" \
-            "\n" \
-            "key NUMPAD_7 {\n" \
-            "    label:                              '7'\n" \
-            "    base:                               fallback MOVE_HOME\n" \
-            "    numlock:                            '7'\n" \
-            "}\n" \
-            "\n" \
-            "key NUMPAD_8 {\n" \
-            "    label:                              '8'\n" \
-            "    base:                               fallback DPAD_UP\n" \
-            "    numlock:                            '8'\n" \
-            "}\n" \
-            "\n" \
-            "key NUMPAD_9 {\n" \
-            "    label:                              '9'\n" \
-            "    base:                               fallback PAGE_UP\n" \
-            "    numlock:                            '9'\n" \
-            "}\n" \
-            "\n" \
-            "key NUMPAD_LEFT_PAREN {\n" \
-            "    label:                              '('\n" \
-            "    base:                               '('\n" \
-            "}\n" \
-            "\n" \
-            "key NUMPAD_RIGHT_PAREN {\n" \
-            "    label:                              ')'\n" \
-            "    base:                               ')'\n" \
-            "}\n" \
-            "\n" \
-            "key NUMPAD_DIVIDE {\n" \
-            "    label:                              '/'\n" \
-            "    base:                               '/'\n" \
-            "}\n" \
-            "\n" \
-            "key NUMPAD_MULTIPLY {\n" \
-            "    label:                              '*'\n" \
-            "    base:                               '*'\n" \
-            "}\n" \
-            "\n" \
-            "key NUMPAD_SUBTRACT {\n" \
-            "    label:                              '-'\n" \
-            "    base:                               '-'\n" \
-            "}\n" \
-            "\n" \
-            "key NUMPAD_ADD {\n" \
-            "    label:                              '+'\n" \
-            "    base:                               '+'\n" \
-            "}\n" \
-            "\n" \
-            "key NUMPAD_DOT {\n" \
-            "    label:                              '.'\n" \
-            "    base:                               fallback FORWARD_DEL\n" \
-            "    numlock:                            '.'\n" \
-            "}\n" \
-            "\n" \
-            "key NUMPAD_COMMA {\n" \
-            "    label:                              ','\n" \
-            "    base:                               ','\n" \
-            "}\n" \
-            "\n" \
-            "key NUMPAD_EQUALS {\n" \
-            "    label:                              '='\n" \
-            "    base:                               '='\n" \
-            "}\n" \
-            "\n" \
-            "key NUMPAD_ENTER {\n" \
-            "    label:                              '\\n'\n" \
-            "    base:                               '\\n' fallback ENTER\n" \
-            "    ctrl, alt, meta:                    none fallback ENTER\n" \
-            "}\n" \
-            "\n" \
-            "### Special keys on phones ###\n" \
-            "\n" \
-            "key AT {\n" \
-            "    label:                              '@'\n" \
-            "    base:                               '@'\n" \
-            "}\n" \
-            "\n" \
-            "key STAR {\n" \
-            "    label:                              '*'\n" \
-            "    base:                               '*'\n" \
-            "}\n" \
-            "\n" \
-            "key POUND {\n" \
-            "    label:                              '#'\n" \
-            "    base:                               '#'\n" \
-            "}\n" \
-            "\n" \
-            "key PLUS {\n" \
-            "    label:                              '+'\n" \
-            "    base:                               '+'\n" \
-            "}\n" \
-            "\n" \
-            "### Non-printing keys ###\n" \
-            "\n" \
-            "key ESCAPE {\n" \
-            "    base:                               fallback BACK\n" \
-            "    alt, meta:                          fallback HOME\n" \
-            "    ctrl:                               fallback MENU\n" \
-            "}\n" \
-            "\n" \
-            "### Gamepad buttons ###\n" \
-            "\n" \
-            "key BUTTON_A {\n" \
-            "    base:                               fallback BACK\n" \
-            "}\n" \
-            "\n" \
-            "key BUTTON_B {\n" \
-            "    base:                               fallback BACK\n" \
-            "}\n" \
-            "\n" \
-            "key BUTTON_C {\n" \
-            "    base:                               fallback BACK\n" \
-            "}\n" \
-            "\n" \
-            "key BUTTON_X {\n" \
-            "    base:                               fallback DPAD_CENTER\n" \
-            "}\n" \
-            "\n" \
-            "key BUTTON_Y {\n" \
-            "    base:                               fallback DPAD_CENTER\n" \
-            "}\n" \
-            "\n" \
-            "key BUTTON_Z {\n" \
-            "    base:                               fallback DPAD_CENTER\n" \
-            "}\n" \
-            "\n" \
-            "key BUTTON_L1 {\n" \
-            "    base:                               none\n" \
-            "}\n" \
-            "\n" \
-            "key BUTTON_R1 {\n" \
-            "    base:                               none\n" \
-            "}\n" \
-            "\n" \
-            "key BUTTON_L2 {\n" \
-            "    base:                               none\n" \
-            "}\n" \
-            "\n" \
-            "key BUTTON_R2 {\n" \
-            "    base:                               none\n" \
-            "}\n" \
-            "\n" \
-            "key BUTTON_THUMBL {\n" \
-            "    base:                               fallback DPAD_CENTER\n" \
-            "}\n" \
-            "\n" \
-            "key BUTTON_THUMBR {\n" \
-            "    base:                               fallback DPAD_CENTER\n" \
-            "}\n" \
-            "\n" \
-            "key BUTTON_START {\n" \
-            "    base:                               fallback HOME\n" \
-            "}\n" \
-            "\n" \
-            "key BUTTON_SELECT {\n" \
-            "    base:                               fallback MENU\n" \
-            "}\n" \
-            "\n" \
-            "key BUTTON_MODE {\n" \
-            "    base:                               fallback MENU\n" \
-            "}\n" \
-            "\n" \
-            "key BUTTON_1 {\n" \
-            "    base:                               fallback DPAD_CENTER\n" \
-            "}\n" \
-            "\n" \
-            "key BUTTON_2 {\n" \
-            "    base:                               fallback DPAD_CENTER\n" \
-            "}\n" \
-            "\n" \
-            "key BUTTON_3 {\n" \
-            "    base:                               fallback DPAD_CENTER\n" \
-            "}\n" \
-            "\n" \
-            "key BUTTON_4 {\n" \
-            "    base:                               fallback DPAD_CENTER\n" \
-            "}\n" \
-            "\n" \
-            "key BUTTON_5 {\n" \
-            "    base:                               fallback DPAD_CENTER\n" \
-            "}\n" \
-            "\n" \
-            "key BUTTON_6 {\n" \
-            "    base:                               fallback DPAD_CENTER\n" \
-            "}\n" \
-            "\n" \
-            "key BUTTON_7 {\n" \
-            "    base:                               fallback DPAD_CENTER\n" \
-            "}\n" \
-            "\n" \
-            "key BUTTON_8 {\n" \
-            "    base:                               fallback DPAD_CENTER\n" \
-            "}\n" \
-            "\n" \
-            "key BUTTON_9 {\n" \
-            "    base:                               fallback DPAD_CENTER\n" \
-            "}\n" \
-            "\n" \
-            "key BUTTON_10 {\n" \
-            "    base:                               fallback DPAD_CENTER\n" \
-            "}\n" \
-            "\n" \
-            "key BUTTON_11 {\n" \
-            "    base:                               fallback DPAD_CENTER\n" \
-            "}\n" \
-            "\n" \
-            "key BUTTON_12 {\n" \
-            "    base:                               fallback DPAD_CENTER\n" \
-            "}\n" \
-            "\n" \
-            "key BUTTON_13 {\n" \
-            "    base:                               fallback DPAD_CENTER\n" \
-            "}\n" \
-            "\n" \
-            "key BUTTON_14 {\n" \
-            "    base:                               fallback DPAD_CENTER\n" \
-            "}\n" \
-            "\n" \
-            "key BUTTON_15 {\n" \
-            "    base:                               fallback DPAD_CENTER\n" \
-            "}\n" \
-            "\n" \
-            "key BUTTON_16 {\n" \
-            "    base:                               fallback DPAD_CENTER\n" \
-            "}";
-    return result;
-}

=== removed file '3rd_party/android-input/android/frameworks/base/services/input/InputDevice.cpp'
--- 3rd_party/android-input/android/frameworks/base/services/input/InputDevice.cpp	2015-06-15 22:24:08 +0000
+++ 3rd_party/android-input/android/frameworks/base/services/input/InputDevice.cpp	1970-01-01 00:00:00 +0000
@@ -1,205 +0,0 @@
-/*
- * Copyright (C) 2012 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#define LOG_TAG "InputDevice"
-
-#include <cutils/log.h>
-#define DEBUG_PROBE 0
-
-#include <stdlib.h>
-#include <unistd.h>
-#include <ctype.h>
-
-#include <androidfw/InputDevice.h>
-
-namespace android {
-
-static const char* CONFIGURATION_FILE_DIR[] = {
-        "idc/",
-        "keylayout/",
-        "keychars/",
-};
-
-static const char* CONFIGURATION_FILE_EXTENSION[] = {
-        ".idc",
-        ".kl",
-        ".kcm",
-};
-
-static bool isValidNameChar(char ch) {
-    return isascii(ch) && (isdigit(ch) || isalpha(ch) || ch == '-' || ch == '_');
-}
-
-static void appendInputDeviceConfigurationFileRelativePath(String8& path,
-        const String8& name, InputDeviceConfigurationFileType type) {
-    path.append(CONFIGURATION_FILE_DIR[type]);
-    for (size_t i = 0; i < name.length(); i++) {
-        char ch = name[i];
-        if (!isValidNameChar(ch)) {
-            ch = '_';
-        }
-        path.append(&ch, 1);
-    }
-    path.append(CONFIGURATION_FILE_EXTENSION[type]);
-}
-
-String8 getInputDeviceConfigurationFilePathByDeviceIdentifier(
-        const InputDeviceIdentifier& deviceIdentifier,
-        InputDeviceConfigurationFileType type) {
-    if (deviceIdentifier.vendor !=0 && deviceIdentifier.product != 0) {
-        if (deviceIdentifier.version != 0) {
-            // Try vendor product version.
-            String8 versionPath(getInputDeviceConfigurationFilePathByName(
-                    formatString8("Vendor_%04x_Product_%04x_Version_%04x",
-                            deviceIdentifier.vendor, deviceIdentifier.product,
-                            deviceIdentifier.version),
-                    type));
-            if (!isEmpty(versionPath)) {
-                return versionPath;
-            }
-        }
-
-        // Try vendor product.
-        String8 productPath(getInputDeviceConfigurationFilePathByName(
-                formatString8("Vendor_%04x_Product_%04x",
-                        deviceIdentifier.vendor, deviceIdentifier.product),
-                type));
-        if (!isEmpty(productPath)) {
-            return productPath;
-        }
-    }
-
-    // Try device name.
-    return getInputDeviceConfigurationFilePathByName(deviceIdentifier.name, type);
-}
-
-String8 getConfigurationFilePathInDirectory(String8 const& directory, String8 const& name, InputDeviceConfigurationFileType type)
-{
-    String8 path = directory;
-    appendInputDeviceConfigurationFileRelativePath(path, name, type);
-#if DEBUG_PROBE
-    ALOGD("Probing for input device configuration file: path='%s'", path.c_str());
-#endif
-    if (!access(c_str(path), R_OK)) {
-#if DEBUG_PROBE
-        ALOGD("Found");
-#endif
-        return path;
-    }
-
-    return String8();
-}
-    
-String8 getInputDeviceConfigurationFilePathByName(
-        const String8& name, InputDeviceConfigurationFileType type) {
-    // Search system repository.
-    String8 path;
-    setTo(path, "/usr/share/");
-    auto result = getConfigurationFilePathInDirectory(path, name, type);
-    if (result.length())
-        return result;
-
-    {
-        const char *root_env = getenv("ANDROID_ROOT");
-        if (root_env == NULL) root_env = "";
-        setTo(path, root_env);
-    }
-    // </mir modifications>
-    path.append("/usr/");
-    result = getConfigurationFilePathInDirectory(path, name, type);
-    if (result.length())
-        return result;
-
-    // Search user repository.
-    // TODO Should only look here if not in safe mode. ( ?? ~ racarr)
-    {
-        const char *data_env = getenv("ANDROID_DATA");
-        if (data_env == NULL) data_env = "";
-        setTo(path, data_env);
-    }
-
-    path.append("/system/devices/");
-    result = getConfigurationFilePathInDirectory(path, name, type);
-    if (result.length())
-        return result;
-
-    // Not found.
-#if DEBUG_PROBE
-    ALOGD("Probe failed to find input device configuration file: name='%s', type=%d",
-            name.c_str(), type);
-#endif
-    return String8();
-}
-
-
-// --- InputDeviceInfo ---
-
-InputDeviceInfo::InputDeviceInfo() {
-    initialize(-1, -1, InputDeviceIdentifier(), String8(), false);
-}
-
-InputDeviceInfo::InputDeviceInfo(const InputDeviceInfo& other) :
-        mId(other.mId), mGeneration(other.mGeneration), mIdentifier(other.mIdentifier),
-        mAlias(other.mAlias), mIsExternal(other.mIsExternal), mSources(other.mSources),
-        mKeyboardType(other.mKeyboardType),
-        mKeyCharacterMap(other.mKeyCharacterMap),
-        mHasVibrator(other.mHasVibrator),
-        mMotionRanges(other.mMotionRanges) {
-}
-
-InputDeviceInfo::~InputDeviceInfo() {
-}
-
-void InputDeviceInfo::initialize(int32_t id, int32_t generation,
-        const InputDeviceIdentifier& identifier, const String8& alias, bool isExternal) {
-    mId = id;
-    mGeneration = generation;
-    mIdentifier = identifier;
-    mAlias = alias;
-    mIsExternal = isExternal;
-    mSources = 0;
-    mKeyboardType = AINPUT_KEYBOARD_TYPE_NONE;
-    mHasVibrator = false;
-    mMotionRanges.clear();
-}
-
-const InputDeviceInfo::MotionRange* InputDeviceInfo::getMotionRange(
-        int32_t axis, uint32_t source) const {
-    size_t numRanges = mMotionRanges.size();
-    for (size_t i = 0; i < numRanges; i++) {
-        const MotionRange& range = mMotionRanges.itemAt(i);
-        if (range.axis == axis && range.source == source) {
-            return &range;
-        }
-    }
-    return NULL;
-}
-
-void InputDeviceInfo::addSource(uint32_t source) {
-    mSources |= source;
-}
-
-void InputDeviceInfo::addMotionRange(int32_t axis, uint32_t source, float min, float max,
-        float flat, float fuzz) {
-    MotionRange range = { axis, source, min, max, flat, fuzz };
-    mMotionRanges.add(range);
-}
-
-void InputDeviceInfo::addMotionRange(const MotionRange& range) {
-    mMotionRanges.add(range);
-}
-
-} // namespace android

=== removed file '3rd_party/android-input/android/frameworks/base/services/input/InputListener.cpp'
--- 3rd_party/android-input/android/frameworks/base/services/input/InputListener.cpp	2015-08-17 18:33:38 +0000
+++ 3rd_party/android-input/android/frameworks/base/services/input/InputListener.cpp	1970-01-01 00:00:00 +0000
@@ -1,183 +0,0 @@
-/*
- * Copyright (C) 2011 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#define LOG_TAG "InputListener"
-
-//#define LOG_NDEBUG 0
-
-#include "InputListener.h"
-
-#include <cutils/log.h>
-
-namespace android {
-
-// --- NotifyConfigurationChangedArgs ---
-
-NotifyConfigurationChangedArgs::NotifyConfigurationChangedArgs(std::chrono::nanoseconds eventTime) :
-        eventTime(eventTime) {
-}
-
-NotifyConfigurationChangedArgs::NotifyConfigurationChangedArgs(
-        const NotifyConfigurationChangedArgs& other) :
-        eventTime(other.eventTime) {
-}
-
-void NotifyConfigurationChangedArgs::notify(InputListenerInterface& listener) const {
-    listener.notifyConfigurationChanged(this);
-}
-
-
-// --- NotifyKeyArgs ---
-
-NotifyKeyArgs::NotifyKeyArgs(std::chrono::nanoseconds eventTime, uint64_t mac,
-        int32_t deviceId, uint32_t source, uint32_t policyFlags,
-        int32_t action, int32_t flags, int32_t keyCode, int32_t scanCode,
-        int32_t metaState, std::chrono::nanoseconds downTime) :
-        eventTime(eventTime), deviceId(deviceId), source(source), policyFlags(policyFlags),
-        action(action), flags(flags), keyCode(keyCode), scanCode(scanCode),
-        metaState(metaState), downTime(downTime) {
-}
-
-NotifyKeyArgs::NotifyKeyArgs(const NotifyKeyArgs& other) :
-        eventTime(other.eventTime), mac(other.mac),
-        deviceId(other.deviceId), source(other.source),
-        policyFlags(other.policyFlags),
-        action(other.action), flags(other.flags),
-        keyCode(other.keyCode), scanCode(other.scanCode),
-        metaState(other.metaState), downTime(other.downTime) {
-}
-
-void NotifyKeyArgs::notify(InputListenerInterface& listener) const {
-    listener.notifyKey(this);
-}
-
-
-// --- NotifyMotionArgs ---
-
-NotifyMotionArgs::NotifyMotionArgs(std::chrono::nanoseconds eventTime, uint64_t mac,
-        int32_t deviceId, uint32_t source, uint32_t policyFlags,
-        int32_t action, int32_t flags, int32_t metaState, int32_t buttonState,
-        int32_t edgeFlags, uint32_t pointerCount,
-        const PointerProperties* pointerProperties, const PointerCoords* pointerCoords,
-        float xPrecision, float yPrecision, std::chrono::nanoseconds downTime) :
-        eventTime(eventTime), mac(mac), deviceId(deviceId), source(source),
-        policyFlags(policyFlags), action(action), flags(flags), metaState(metaState),
-        buttonState(buttonState), edgeFlags(edgeFlags), pointerCount(pointerCount),
-        xPrecision(xPrecision), yPrecision(yPrecision), downTime(downTime) {
-    for (uint32_t i = 0; i < pointerCount; i++) {
-        this->pointerProperties[i].copyFrom(pointerProperties[i]);
-        this->pointerCoords[i].copyFrom(pointerCoords[i]);
-    }
-}
-
-NotifyMotionArgs::NotifyMotionArgs(const NotifyMotionArgs& other) :
-        eventTime(other.eventTime), mac(other.mac),
-        deviceId(other.deviceId), source(other.source),
-        policyFlags(other.policyFlags),
-        action(other.action), flags(other.flags),
-        metaState(other.metaState), buttonState(other.buttonState),
-        edgeFlags(other.edgeFlags), pointerCount(other.pointerCount),
-        xPrecision(other.xPrecision), yPrecision(other.yPrecision), downTime(other.downTime) {
-    for (uint32_t i = 0; i < pointerCount; i++) {
-        pointerProperties[i].copyFrom(other.pointerProperties[i]);
-        pointerCoords[i].copyFrom(other.pointerCoords[i]);
-    }
-}
-
-void NotifyMotionArgs::notify(InputListenerInterface& listener) const {
-    listener.notifyMotion(this);
-}
-
-
-// --- NotifySwitchArgs ---
-
-NotifySwitchArgs::NotifySwitchArgs(std::chrono::nanoseconds eventTime, uint32_t policyFlags,
-        int32_t switchCode, int32_t switchValue) :
-        eventTime(eventTime), policyFlags(policyFlags),
-        switchCode(switchCode), switchValue(switchValue) {
-}
-
-NotifySwitchArgs::NotifySwitchArgs(const NotifySwitchArgs& other) :
-        eventTime(other.eventTime), policyFlags(other.policyFlags),
-        switchCode(other.switchCode), switchValue(other.switchValue) {
-}
-
-void NotifySwitchArgs::notify(InputListenerInterface& listener) const {
-    listener.notifySwitch(this);
-}
-
-
-// --- NotifyDeviceResetArgs ---
-
-NotifyDeviceResetArgs::NotifyDeviceResetArgs(std::chrono::nanoseconds eventTime, int32_t deviceId) :
-        eventTime(eventTime), deviceId(deviceId) {
-}
-
-NotifyDeviceResetArgs::NotifyDeviceResetArgs(const NotifyDeviceResetArgs& other) :
-        eventTime(other.eventTime), deviceId(other.deviceId) {
-}
-
-void NotifyDeviceResetArgs::notify(InputListenerInterface& listener) const {
-    listener.notifyDeviceReset(this);
-}
-
-
-// --- QueuedInputListener ---
-
-QueuedInputListener::QueuedInputListener(const std::shared_ptr<InputListenerInterface>& innerListener) :
-        mInnerListener(innerListener) {
-}
-
-QueuedInputListener::~QueuedInputListener() {
-    size_t count = mArgsQueue.size();
-    for (size_t i = 0; i < count; i++) {
-        delete mArgsQueue[i];
-    }
-}
-
-void QueuedInputListener::notifyConfigurationChanged(
-        const NotifyConfigurationChangedArgs* args) {
-    mArgsQueue.push(new NotifyConfigurationChangedArgs(*args));
-}
-
-void QueuedInputListener::notifyKey(const NotifyKeyArgs* args) {
-    mArgsQueue.push(new NotifyKeyArgs(*args));
-}
-
-void QueuedInputListener::notifyMotion(const NotifyMotionArgs* args) {
-    mArgsQueue.push(new NotifyMotionArgs(*args));
-}
-
-void QueuedInputListener::notifySwitch(const NotifySwitchArgs* args) {
-    mArgsQueue.push(new NotifySwitchArgs(*args));
-}
-
-void QueuedInputListener::notifyDeviceReset(const NotifyDeviceResetArgs* args) {
-    mArgsQueue.push(new NotifyDeviceResetArgs(*args));
-}
-
-void QueuedInputListener::flush() {
-    size_t count = mArgsQueue.size();
-    for (size_t i = 0; i < count; i++) {
-        NotifyArgs* args = mArgsQueue[i];
-        args->notify(*mInnerListener);
-        delete args;
-    }
-    mArgsQueue.clear();
-}
-
-
-} // namespace android

=== removed file '3rd_party/android-input/android/frameworks/base/services/input/InputReader.cpp'
--- 3rd_party/android-input/android/frameworks/base/services/input/InputReader.cpp	2015-09-24 15:42:21 +0000
+++ 3rd_party/android-input/android/frameworks/base/services/input/InputReader.cpp	1970-01-01 00:00:00 +0000
@@ -1,6356 +0,0 @@
-/*
- * Copyright (C) 2010 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#define LOG_TAG "InputReader"
-
-//#define LOG_NDEBUG 0
-
-// Log debug messages for each raw event received from the EventHub.
-#define DEBUG_RAW_EVENTS 0
-
-// Log debug messages about touch screen filtering hacks.
-#define DEBUG_HACKS 0
-
-// Log debug messages about virtual key processing.
-#define DEBUG_VIRTUAL_KEYS 0
-
-// Log debug messages about pointers.
-#define DEBUG_POINTERS 0
-
-// Log debug messages about pointer assignment calculations.
-#define DEBUG_POINTER_ASSIGNMENT 0
-
-// Log debug messages about gesture detection.
-#define DEBUG_GESTURES 0
-
-// Log debug messages about the vibrator.
-#define DEBUG_VIBRATOR 0
-
-#include "InputReader.h"
-
-#include <cutils/log.h>
-#include <androidfw/Keyboard.h>
-#include <androidfw/VirtualKeyMap.h>
-
-#include <android/keycodes.h>
-
-#include <std/BitSet.h>
-
-#include <stddef.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <errno.h>
-#include <limits.h>
-#include <math.h>
-
-#if DEBUG_RAW_EVENTS
-#include "InputEventPrinter.h"
-#endif
-
-#define INDENT "  "
-#define INDENT2 "    "
-#define INDENT3 "      "
-#define INDENT4 "        "
-#define INDENT5 "          "
-
-namespace android {
-
-// --- Constants ---
-
-// Maximum number of slots supported when using the slot-based Multitouch Protocol B.
-static const size_t MAX_SLOTS = 32;
-
-// --- Static Functions ---
-
-template<typename T>
-inline static T min(const T& a, const T& b) {
-    return a < b ? a : b;
-}
-
-template<typename T>
-inline static void swap(T& a, T& b) {
-    T temp = a;