~mir-team/mir/in-process-egl+input-conglomeration

« back to all changes in this revision

Viewing changes to 3rd_party/android-input/android/frameworks/base/services/input/EventHub.h

Merged trunk and fixed issues

Show diffs side-by-side

added added

removed removed

Lines of Context:
24
24
#include <androidfw/KeyLayoutMap.h>
25
25
#include <androidfw/KeyCharacterMap.h>
26
26
#include <androidfw/VirtualKeyMap.h>
27
 
#include ANDROIDFW_UTILS(String8.h)
28
 
#include ANDROIDFW_UTILS(Mutex.h)
29
 
#include ANDROIDFW_UTILS(List.h)
30
 
#include ANDROIDFW_UTILS(Errors.h)
31
 
#include ANDROIDFW_UTILS(PropertyMap.h)
32
 
#include ANDROIDFW_UTILS(Vector.h)
33
 
#include ANDROIDFW_UTILS(KeyedVector.h)
 
27
#include <std/String8.h>
 
28
#include <std/Mutex.h>
 
29
#include <std/List.h>
 
30
#include <std/Errors.h>
 
31
#include <std/PropertyMap.h>
 
32
#include <std/Vector.h>
 
33
#include <std/KeyedVector.h>
34
34
 
35
35
#include <linux/input.h>
36
36
#include <sys/epoll.h>