Mike Lockwood 69ccdbd78a Merge commit 'bc52ca2' ...

Conflicts:
	services/java/com/android/server/am/ActivityManagerService.java

Change-Id: I6da33a191a4ac13d08d8350a432b205e3dff85da

2012-04-03 11:53:47 -07:00

..

accessibility

Fixing issues with the AccessibilityNodeInfo cache.

2012-02-23 18:51:04 -08:00

am

Merge commit 'bc52ca2'

2012-04-03 11:53:47 -07:00

connectivity

Don't forget to turn off mobile_dun

2012-02-29 14:02:55 -08:00

location

am 8f30d219: am f0533f94: am 0e873700: Remove the country detector logging

2012-03-12 18:30:17 -07:00

net

Move network policy to per-appId (instead of UID).

2012-03-22 11:02:43 -07:00

pm

User management and switching

2012-03-27 11:23:01 -07:00

usb

Stop showing ADB and MTP/PTP/USB notifications at the top.

2012-03-29 00:42:16 -04:00

wm

Merge "Refactor to convert four state booleans to int."

2012-04-02 13:57:42 -07:00

AlarmManagerService.java

Add new Intent API for associating a ClipData with an Intent.

2012-03-08 14:34:03 -08:00

AppWidgetService.java

User management and switching

2012-03-27 11:23:01 -07:00

AppWidgetServiceImpl.java

User management and switching

2012-03-27 11:23:01 -07:00

AttributeCache.java

…

BackupManagerService.java

Fix uninstallation tracking in the Backup Manager

2012-03-27 16:29:35 -07:00

BatteryService.java

…

BootReceiver.java

Remove unused android.net.Downloads.

2012-03-20 17:58:27 -07:00

BrickReceiver.java

…

ClipboardService.java

User management and switching

2012-03-27 11:23:01 -07:00

CommonTimeManagementService.java

Add the CommonTimeManagementService.

2012-02-16 13:45:10 -08:00

ConnectivityService.java

Fix the bug net.dns1.pid is same as net.dns2.pid

2012-03-02 10:23:03 -08:00

CountryDetectorService.java

Remove the country detector logging

2012-03-12 17:04:17 -07:00

DevicePolicyManagerService.java

Fix 5863053: Add method to lock screen immediately.

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

DeviceStorageMonitorService.java

Fix free_cache to actually work

2011-12-01 09:07:55 -08:00

DiskStatsService.java

…

DockObserver.java

…

DropBoxManagerService.java

Fix deadlock by making DropBoxManager call async.

2012-03-06 09:30:18 -08:00

EntropyMixer.java

…

EventLogTags.logtags

Move network stats to FileRotator pattern.

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

INativeDaemonConnectorCallbacks.java

…

InputMethodManagerService.java

Hide ongoing notification icon when the screen is locked.

2012-04-02 19:54:28 +09:00

IntentResolver.java

Package restrictions per user

2012-03-22 10:08:24 -07:00

LightsService.java

…

LocationManagerService.java

Move away from deprecated NetworkInfo extra.

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

MasterClearReceiver.java

…

MountService.java

Package restrictions per user

2012-03-22 10:08:24 -07:00

NativeDaemonConnector.java

Record the trimmed cmd string for logs

2012-03-13 12:30:14 -07:00

NativeDaemonConnectorException.java

…

NativeDaemonEvent.java

Make NDC not block forever and handle restart.

2012-02-29 16:53:27 -08:00

NetworkManagementService.java

Merge "Fix softap start"

2012-03-09 11:06:42 -08:00

NetworkTimeUpdateService.java

NetworkTimeUpdateService: Schedule NTP on ethernet connect as well as wifi

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

NotificationManagerService.java

Dump the uid of a notification, for debugging.

2012-03-30 10:47:23 -07:00

NotificationPlayer.java

…

PackageManagerBackupAgent.java

…

PowerManagerService.java

Set the reason for screen-off before usage.

2012-03-13 11:38:38 -07: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

Add new feature to let apps layout over status bar / system bar.

2012-03-30 15:22:04 -07:00

SystemBackupAgent.java

Multi-user - wallpaper service

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

SystemServer.java

Merge: Introduce UpdateLocks

2012-02-29 14:05:24 -08:00

TelephonyRegistry.java

…

TextServicesManagerService.java

Unblock IPC call in TextServicesManagerService

2012-02-28 17:00:46 +09:00

ThrottleService.java

…

TwilightCalculator.java

…

UiModeManagerService.java

Add new "options" argument to all startActivity APIs.

2012-03-14 12:57:14 -07:00

UpdateLockService.java

Merge: Send UpdateLock broadcasts to manifest receivers

2012-03-01 13:00:30 -08:00

VibratorService.java

…

WallpaperManagerService.java

User management and switching

2012-03-27 11:23:01 -07:00

Watchdog.java

…

WifiService.java

Control suspend optimizations from framework

2012-03-26 23:48:53 -07:00

WiredAccessoryObserver.java

Fixed headset detection broken on stingray

2012-03-23 17:32:37 -07:00