Mike Lockwood 22f41918fa resolved conflicts for merge of 6327a9fe to master ...

Change-Id: I1a398a7100abf75d8df7ae9a3d6110829645ae64

2010-10-07 13:55:25 -04: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

BatteryService: Add support for new standard battery voltage and temperature attributes.

2009-08-17 19:58:32 -04:00

com_android_server_InputManager.cpp

am e11b76d3: am f6295b35: Merge "Minor logging changes to input dispatcher to help with debugging." into gingerbread

2010-10-01 21:49:29 -07:00

com_android_server_LightsService.cpp

LightsService cleanup:

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

com_android_server_location_GpsLocationProvider.cpp

GPS: Clean up GPS API extension initialization in JNI code.

2010-10-05 15:07:57 -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