Robert Greenwalt 09ac3c3cbc resolved conflicts for merge of 1f2f23bd to master

2010-01-26 10:09:52 -08:00

..

am

As requested, expand ANR event log entry (and crash/WTF too) to include

2010-01-22 14:47:35 -08:00

status

Make the space between the time and the AM/PM smaller by putting preceding whitespace inside the

2010-01-17 19:09:35 -05:00

AccessibilityManagerService.java

…

AlarmManagerService.java

Implement API to have new broadcasts replace existing broadcasts.

2009-12-14 15:03:35 -08:00

AppWidgetService.java

Update imports to android-common

2009-12-21 13:59:18 -08:00

AttributeCache.java

…

BackupManagerService.java

Don't crash the system process when a backup transport unregisters

2009-12-22 16:01:32 -08:00

BatteryService.java

move some system services from gservices to secure settings

2010-01-07 14:20:39 -08:00

BootReceiver.java

Simplify & update ANR logging; report ANR data into the dropbox.

2010-01-11 14:51:22 -08:00

BrickReceiver.java

…

ClipboardService.java

…

ConnectivityService.java

resolved conflicts for merge of 1f2f23bd to master

2010-01-26 10:09:52 -08:00

DemoDataSet.java

…

DevicePolicyManagerService.java

Don't crash when there is no admin.

2010-01-21 16:29:00 -08:00

DeviceStorageMonitorService.java

move some system services from gservices to secure settings

2010-01-07 14:20:39 -08:00

DockObserver.java

Fix 2385283: Add DevicePolicyManager calls to LockScreen.

2010-01-20 14:48:37 -08:00

DropBoxManagerService.java

Simplify & update ANR logging; report ANR data into the dropbox.

2010-01-11 14:51:22 -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

add recovery system interface to API

2010-01-05 20:03:19 -08:00

HeadsetObserver.java

Fix issue 2324029: In-call (and other) audio screwed up after using Pandora (ERD72).

2009-12-14 03:45:41 -08:00

INativeDaemonConnectorCallbacks.java

services: Introduce NativeDaemonConnector class

2010-01-12 13:55:39 -08:00

InputDevice.java

Fix issue #2300232: Bugs in resolving conflicting pointers

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

InputMethodManagerService.java

Implement API to have new broadcasts replace existing broadcasts.

2009-12-14 15:03:35 -08:00

Installer.java

Encrypted File Systems Project. Installer modifications.

2009-11-24 11:44:19 -08:00

IntentResolver.java

…

JournaledFile.java

…

KeyInputQueue.java

Update imports to android-common

2009-12-21 13:59:18 -08:00

LightsService.java

Implement Notification.DEFAULT_LIGHTS flag.

2010-01-20 22:43:47 -05:00

LoadAverageService.java

…

LocationManagerService.java

LocationManagerService: Fix bug removing proximity alerts.

2010-01-19 14:00:48 -05:00

MasterClearReceiver.java

…

MountService.java

MountService: Add support for renaming secure containers

2010-01-23 08:12:43 -08:00

NativeDaemonConnector.java

NativeDaemonConnector: Add a convenience method for obtaining lists

2010-01-20 15:32:02 -08:00

NetStatService.java

Migration to TrafficStats.

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

NetworkManagementService.java

NetworkManagementService: Start service when SystemServer starts up

2010-01-26 07:51:05 -08:00

NotificationManagerService.java

Implement Notification.DEFAULT_LIGHTS flag.

2010-01-20 22:43:47 -05:00

PackageManagerBackupAgent.java

Remove DEBUG-only logging in metadata backup agent

2009-09-29 16:10:55 -07:00

PackageManagerService.java

Mount/Unmount secure containers

2010-01-19 14:04:54 -08:00

PowerManagerService.java

More device policy manager / admin work.

2010-01-21 14:30:57 -08:00

ProcessMap.java

…

ProcessStats.java

…

RandomBlock.java

Work on issue #2163789: Way too much logging

2009-10-04 14:48:47 -07:00

SensorService.java

…

ShutdownActivity.java

…

SystemBackupAgent.java

Don't back up system wallpapers.

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

SystemServer.java

NetworkManagementService: Start service when SystemServer starts up

2010-01-26 07:51:05 -08:00

TelephonyRegistry.java

Implement API to have new broadcasts replace existing broadcasts.

2009-12-14 15:03:35 -08:00

VibratorService.java

Remove HardwareService and move vibrator support to VibratorService.

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

ViewServer.java

Bump ViewServer version number from 2 to 3

2009-12-14 18:54:33 -08:00

WallpaperManagerService.java

resolved conflicts for merge of ad2fa35d to master

2009-12-22 10:11:55 -08:00

Watchdog.java

move Watchdog's settings from Gservices to Secure

2010-01-06 16:38:14 -08:00

WifiService.java

DO NOT MERGE Avoid wifi disable in a UNKNOWN state

2010-01-20 10:08:23 -08:00

WifiWatchdogService.java

…

WindowManagerService.java

Deprecate fill_parent and introduce match_parent.

2010-01-08 15:11:38 -08:00