Christopher Tate 09f82ec61c am af1255da: resolved conflicts for merge of 2624fbca to eclair-mr2 ...

Merge commit 'af1255dab8fa3eab1caf9bae799f80de14a74470' into eclair-mr2-plus-aosp

* commit 'af1255dab8fa3eab1caf9bae799f80de14a74470':
  Fix #2320798: Device hang then runtime restart

2009-12-11 13:20:15 -08:00

..

am

am af9788a9: Merge change Ia53c6725 into eclair-mr2

2009-12-09 15:55:28 -08:00

status

Fix updating Bluetooth icon on status bar and for Wifi.

2009-12-07 15:16:22 -08:00

AccessibilityManagerService.java

…

AlarmManagerService.java

AlarmManagerService: Fix daylight savings time offset computation

2009-11-20 15:16:58 -05:00

AppWidgetService.java

…

AttributeCache.java

…

BackupManagerService.java

move event log tags used by system server into this package

2009-12-04 10:31:43 -08:00

BatteryService.java

move event log tags used by system server into this package

2009-12-04 10:31:43 -08:00

BootReceiver.java

Change the DropBoxManager API slightly (this is public, but not yet released) --

2009-11-25 12:38:00 -08:00

BrickReceiver.java

…

ClipboardService.java

…

ConnectivityService.java

DO NOT MERGE Reverting change I53e91db7.

2009-12-07 15:20:50 -08:00

DemoDataSet.java

…

DeviceStorageMonitorService.java

move event log tags used by system server into this package

2009-12-04 10:31:43 -08:00

DockObserver.java

Add support for Car Dock.

2009-12-03 11:35:37 -08:00

DropBoxManagerService.java

More elimination of Formatter (I was tired of waiting several

2009-11-25 13:16:47 -08:00

EntropyService.java

…

EventLogTags.logtags

move event log tags used by system server into this package

2009-12-04 10:31:43 -08:00

FallbackCheckinService.java

…

HeadsetObserver.java

Add logging of headset events to help debug issue.

2009-11-23 13:06:07 -08:00

InputDevice.java

Fix issue #2300232: Bugs in resolving conflicting pointers

2009-12-02 18:42:39 -08:00

InputMethodManagerService.java

move event log tags used by system server into this package

2009-12-04 10:31:43 -08:00

Installer.java

…

IntentResolver.java

…

JournaledFile.java

…

KeyInputQueue.java

Fix issue #2249821: Unable to start passion in safe mode

2009-11-18 11:42:32 -08:00

LightsService.java

LightsService cleanup:

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

LoadAverageService.java

…

LocationManagerService.java

merge from open-source master

2009-11-11 08:26:31 -08:00

MasterClearReceiver.java

…

MountListener.java

…

MountService.java

…

NetStatService.java

Migration to TrafficStats.

2009-12-08 11:14:03 -08:00

NotificationManagerService.java

move event log tags used by system server into this package

2009-12-04 10:31:43 -08:00

PackageManagerBackupAgent.java

…

PackageManagerService.java

move event log tags used by system server into this package

2009-12-04 10:31:43 -08:00

PowerManagerService.java

move event log tags used by system server into this package

2009-12-04 10:31:43 -08:00

ProcessMap.java

…

ProcessStats.java

…

RandomBlock.java

…

SensorService.java

…

ShutdownActivity.java

…

SystemBackupAgent.java

Don't back up system wallpapers.

2009-11-11 22:18:00 -08:00

SystemServer.java

Propagate background scheduling class across processes.

2009-12-07 19:11:14 -08:00

TelephonyRegistry.java

…

VibratorService.java

Remove HardwareService and move vibrator support to VibratorService.

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

ViewServer.java

…

WallpaperManagerService.java

This time for sure: make wallpapers work

2009-11-15 22:53:08 -08:00

Watchdog.java

move event log tags used by system server into this package

2009-12-04 10:31:43 -08:00

WifiService.java

am 9d3cb9bf: Merge change I204e4787 into eclair

2009-12-07 15:31:43 -08:00

WifiWatchdogService.java

…

WindowManagerService.java

resolved conflicts for merge of 2624fbca to eclair-mr2

2009-12-11 13:16:41 -08:00