Wink Saville 41b564f354 resolved conflicts for merge of e8b57fea to master ...

Change-Id: I2ccf2b4cb73faadd0c8608cc21dda5db888d2937

2012-02-10 16:11:18 -08:00

..

accessibility

UI automation service disconnected upon package change.

2012-02-10 14:55:45 -08:00

am

Merge "Multi-user - wallpaper service"

2012-02-10 14:34:52 -08:00

connectivity

Filter our v6 address from tethering dns.

2012-01-24 16:44:50 -08:00

location

…

net

Send broadcast when changing restrict background.

2012-02-07 12:08:58 -08:00

pm

Show the flags in package manager debugging.

2012-02-10 14:44:07 -08:00

usb

Add OEM specific USB mode enumeration based on ro.bootmode property

2012-02-10 12:29:12 -08:00

wm

Fix problems dispatching media button events on headless devices

2012-02-10 10:51:24 -08:00

AlarmManagerService.java

…

AppWidgetService.java

Multi-user - 1st major checkin

2012-02-03 12:01:47 -08:00

AppWidgetServiceImpl.java

Multi-user - wallpaper service

2012-02-10 14:34:07 -08:00

AttributeCache.java

…

BackupManagerService.java

Multi-user - 1st major checkin

2012-02-03 12:01:47 -08:00

BatteryService.java

…

BootReceiver.java

…

BrickReceiver.java

…

ClipboardService.java

…

ConnectivityService.java

Send broadcast when changing restrict background.

2012-02-07 12:08:58 -08:00

CountryDetectorService.java

…

DevicePolicyManagerService.java

Fix 5863053: Add method to lock screen immediately.

2012-01-17 18:11:05 -08:00

DeviceStorageMonitorService.java

…

DiskStatsService.java

…

DockObserver.java

…

DropBoxManagerService.java

…

EntropyMixer.java

…

EventLogTags.logtags

Move network stats to FileRotator pattern.

2012-01-24 11:13:14 -08:00

INativeDaemonConnectorCallbacks.java

…

InputMethodManagerService.java

Add an api to switch to the next IME and subtype

2012-02-10 16:44:12 +09:00

IntentResolver.java

…

LightsService.java

…

LocationManagerService.java

Move away from deprecated NetworkInfo extra.

2012-01-30 11:21:35 -08:00

MasterClearReceiver.java

…

MountService.java

Log netd traffic nicely.

2012-01-20 10:37:11 -08:00

NativeDaemonConnector.java

Revert "Make NDC not block forever and handle restart."

2012-02-07 19:25:42 -08:00

NativeDaemonConnectorException.java

…

NativeDaemonEvent.java

Revert "Make NDC not block forever and handle restart."

2012-02-07 19:25:42 -08:00

NetworkManagementService.java

Log netd traffic nicely.

2012-01-20 10:37:11 -08:00

NetworkTimeUpdateService.java

NetworkTimeUpdateService: Schedule NTP on ethernet connect as well as wifi

2012-02-10 14:44:05 -08:00

NotificationManagerService.java

Multi-user - 1st major checkin

2012-02-03 12:01:47 -08:00

NotificationPlayer.java

…

PackageManagerBackupAgent.java

…

PowerManagerService.java

Fix merge problem

2012-02-10 12:09:31 -08:00

PreferredComponent.java

…

ProcessMap.java

…

RandomBlock.java

…

RecognitionManagerService.java

…

SamplingProfilerService.java

…

SerialService.java

New Serial Manager API:

2012-02-10 10:51:19 -08:00

ShutdownActivity.java

…

StatusBarManagerService.java

…

SystemBackupAgent.java

Multi-user - wallpaper service

2012-02-10 14:34:07 -08:00

SystemServer.java

Add support for disabling wallpaper service

2012-02-10 12:52:46 -08:00

TelephonyRegistry.java

…

TextServicesManagerService.java

…

ThrottleService.java

…

TwilightCalculator.java

…

UiModeManagerService.java

Add a new ui mode for "appliance"

2011-12-15 16:16:14 -08:00

VibratorService.java

…

WallpaperManagerService.java

Multi-user - wallpaper service

2012-02-10 14:34:07 -08:00

Watchdog.java

…

WifiService.java

…

WiredAccessoryObserver.java

Add an option that disables the AUDIO_BECOMING_NOISY intent send when a headset is hotplugged.

2012-02-10 14:44:07 -08:00