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

..

ActivityManagerService.java

Merge commit 'bc52ca2'

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

ActivityRecord.java

Add new thumbnail animation.

2012-03-23 14:13:13 -07:00

ActivityResult.java

…

ActivityStack.java

Add new thumbnail animation.

2012-03-23 14:13:13 -07:00

AppBindRecord.java

Various work on out of memory managment.

2011-07-29 02:06:46 -07:00

AppErrorDialog.java

Fix issue #5446988: WindowManager warns BOOT TIMEOUT,...

2011-10-13 12:55:57 -07:00

AppErrorResult.java

…

AppNotRespondingDialog.java

Fix bug 5154361 - New force close dialog text breaks button order rules

2011-08-14 17:13:10 -07:00

AppWaitingForDebuggerDialog.java

…

BackupRecord.java

Restore from a previous full backup's tarfile

2011-06-01 15:09:55 -07:00

BaseErrorDialog.java

Fix bug 3245465 - Themed dialog icons

2011-01-08 13:09:51 -08:00

BatteryStatsService.java

Move battery stats to xt_qtaguid for data stats.

2011-10-09 13:49:08 -07:00

BroadcastFilter.java

Fix issue #4902856: Don't let apps register non-explicit PendingIntents

2011-06-30 11:23:54 -07:00

BroadcastQueue.java

Package restrictions per user

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

BroadcastRecord.java

Move BroadcastQueue out of the ActivityManager class.

2012-02-10 18:59:48 -08:00

CompatModeDialog.java

Spiffy new compatibility mode UI.

2011-05-25 21:08:37 -07:00

CompatModePackages.java

Package restrictions per user

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

ConnectionRecord.java

Fix issue #4466531: onServiceConnected() not called after...

2011-07-26 22:07:48 -07:00

ContentProviderRecord.java

Fix swiping away recents to always kill processes.

2012-03-15 13:43:08 -07:00

CoreSettingsObserver.java

Propagating core settings to the system process.

2011-03-03 18:20:43 -08:00

DeviceMonitor.java

…

EventLogTags.logtags

More performance work:

2011-11-02 22:08:41 -07:00

FactoryErrorDialog.java

…

IntentBindRecord.java

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

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

LaunchWarningWindow.java

Fix missing AOSP copyright headers for more files

2011-03-17 14:43:12 -07:00

package.html

…

PendingIntentRecord.java

Start using the new activity options argument.

2012-03-19 17:41:10 -07:00

PendingThumbnailsRecord.java

…

ProcessList.java

Add new OOM adjustment for the "previous" process.

2011-11-01 19:25:20 -07:00

ProcessRecord.java

Add new feature for running services in "isolated" sandbox processes.

2012-02-09 11:18:33 -08:00

ProviderMap.java

Fix swiping away recents to always kill processes.

2012-03-15 13:43:08 -07:00

ReceiverList.java

…

ServiceRecord.java

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

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

StrictModeViolationDialog.java

…

TaskAccessInfo.java

Forgot to add this file.

2011-04-12 19:12:30 -07:00

TaskRecord.java

Fix swiping away recents to always kill processes.

2012-03-15 13:43:08 -07:00

ThumbnailHolder.java

Rework thumbnails in activity manager.

2011-04-08 18:16:21 -07:00

TransferPipe.java

DO NOT MERGE. Integrate from master: Improve activity manager debug dumps.

2011-05-13 18:38:19 -07:00

UriPermission.java

…

UriPermissionOwner.java

…

UsageStatsService.java

Add DUMP permission checks to services

2011-09-29 11:04:15 -07:00