Greg Hackmann f1bdbdd1be resolved conflicts for merge of 08579921 to klp-modular-dev ...

Change-Id: I08e9f9a2d2185ccf0c41a87c8527ea7e02ac3117

2013-12-17 11:56:22 -08:00

..

Android.mk

Introduce a Lifecycle for system services

2013-12-12 16:35:11 -08:00

com_android_server_AlarmManagerService.cpp

Add timerfd backend to AlarmManagerService

2013-12-16 16:23:51 -08:00

com_android_server_AssetAtlasService.cpp

Remove dependency on JNIHelp header side effects.

2013-09-10 20:47:43 -07:00

com_android_server_connectivity_Vpn.cpp

…

com_android_server_ConsumerIrService.cpp

consumer_ir: add length to get carrier freqs

2013-09-11 16:21:25 -07:00

com_android_server_input_InputApplicationHandle.cpp

fix JNI use of incStrong/decStrong

2013-03-06 17:48:20 -08:00

com_android_server_input_InputApplicationHandle.h

…

com_android_server_input_InputManagerService.cpp

Merge "Remove dependency on JNIHelp header side effects." into klp-dev

2013-09-12 00:01:28 +00:00

com_android_server_input_InputWindowHandle.cpp

Private flags are masked in correct variable

2013-10-02 16:18:55 -07:00

com_android_server_input_InputWindowHandle.h

…

com_android_server_lights_LightsService.cpp

Introduce a Lifecycle for system services

2013-12-12 16:35:11 -08:00

com_android_server_location_FlpHardwareProvider.cpp

Ensure access to the map of geofence callbacks is synchronized in all cases

2013-09-20 15:19:00 -07:00

com_android_server_location_GpsLocationProvider.cpp

Remove dependency on JNIHelp header side effects.

2013-09-10 20:47:43 -07:00

com_android_server_power_PowerManagerService.cpp

Remove dependency on JNIHelp header side effects.

2013-09-10 20:47:43 -07:00

com_android_server_power_PowerManagerService.h

…

com_android_server_SerialService.cpp

…

com_android_server_SystemServer.cpp

Remove dead code in system server initialization.

2013-07-15 15:08:39 -07:00

com_android_server_UsbDeviceManager.cpp

Remove dependency on JNIHelp header side effects.

2013-09-10 20:47:43 -07:00

com_android_server_UsbHostManager.cpp

Remove dependency on JNIHelp header side effects.

2013-09-10 20:47:43 -07:00

com_android_server_VibratorService.cpp

…

onload.cpp

Add consumer IR framework

2013-09-11 09:52:47 -07:00