Merge "Do not load keylayout if required kernel module is missing" into tm-qpr-dev
Showing
- include/input/InputDevice.h 4 additions, 2 deletionsinclude/input/InputDevice.h
- include/input/KeyLayoutMap.h 5 additions, 1 deletioninclude/input/KeyLayoutMap.h
- include/input/Keyboard.h 1 addition, 3 deletionsinclude/input/Keyboard.h
- libs/input/Android.bp 1 addition, 0 deletionslibs/input/Android.bp
- libs/input/InputDevice.cpp 18 additions, 12 deletionslibs/input/InputDevice.cpp
- libs/input/KeyLayoutMap.cpp 66 additions, 16 deletionslibs/input/KeyLayoutMap.cpp
- libs/input/Keyboard.cpp 26 additions, 13 deletionslibs/input/Keyboard.cpp
- libs/input/tests/Android.bp 2 additions, 1 deletionlibs/input/tests/Android.bp
- libs/input/tests/InputDevice_test.cpp 16 additions, 0 deletionslibs/input/tests/InputDevice_test.cpp
- libs/input/tests/data/kl_with_required_fake_config.kl 20 additions, 0 deletionslibs/input/tests/data/kl_with_required_fake_config.kl
- libs/input/tests/data/kl_with_required_real_config.kl 21 additions, 0 deletionslibs/input/tests/data/kl_with_required_real_config.kl
Loading