Jean-Baptiste Queru 02241ab292 am 89fbcd72: resolved conflicts for merge of c2894474 to gingerbread-plus-aosp ...

Merge commit '89fbcd72fbe6ef26ea2703f8e338fd198c958ecc'

* commit '89fbcd72fbe6ef26ea2703f8e338fd198c958ecc':
  Support showing "Cold" battery health.

2010-10-11 17:49:42 -07:00

..

Android.mk

Send Intents when PTP compatible devices are connected/disconnected to USB

2010-07-27 19:20:15 -04:00

com_android_server_AlarmManagerService.cpp

Fix alarms with negative or very large wakup times.

2010-03-31 15:38:08 -07:00

com_android_server_BatteryService.cpp

Support showing "Cold" battery health.

2010-10-10 17:20:24 -07:00

com_android_server_InputManager.cpp

am 41aabeb5: am 1e6a3a53: Merge "Added more robust tracking and cancelation of events." into gingerbread

2010-10-11 17:42:30 -07:00

com_android_server_LightsService.cpp

LightsService cleanup:

2009-11-27 15:02:11 -05:00

com_android_server_location_GpsLocationProvider.cpp

GPS: Fix another race condition in GPS HAL initialization

2010-10-10 19:25:50 -04:00

com_android_server_PowerManagerService.cpp

Throttle userActivity calls from input dispatcher.

2010-08-16 18:33:50 -07:00

com_android_server_PowerManagerService.h

Input dispatcher ANR handling enhancements.

2010-09-12 16:52:03 -07:00

com_android_server_SystemServer.cpp

auto import from //branches/cupcake/...@137197

2009-03-09 11:52:12 -07:00

com_android_server_UsbObserver.cpp

Send Intents when PTP compatible devices are connected/disconnected to USB

2010-07-27 19:20:15 -04:00

com_android_server_VibratorService.cpp

Remove HardwareService and move vibrator support to VibratorService.

2009-11-25 12:54:58 -05:00

onload.cpp

Send Intents when PTP compatible devices are connected/disconnected to USB

2010-07-27 19:20:15 -04:00