Kenny Root 6a0db59901 resolved conflicts for merge of e0b14ea7 to master ...

Change-Id: Ie018d3e2eba1eb2d655c153880e1951b68c2bd51

2013-12-13 15:59:51 -08:00

..

ActiveServices.java

Fix crash:

2013-12-09 18:20:16 -08:00

ActivityManagerService.java

DO NOT MERGE: Eliminate StackBox.

2013-12-09 15:15:34 -08:00

ActivityRecord.java

Add support for cross-activity scenes and transitions

2013-12-05 10:06:19 -08:00

ActivityResult.java

Remove unused imports from frameworks/base.

2013-11-20 11:31:47 -05:00

ActivityStack.java

resolved conflicts for merge of e0b14ea7 to master

2013-12-13 15:59:51 -08:00

ActivityStackSupervisor.java

DO NOT MERGE: Eliminate StackBox.

2013-12-09 15:15:34 -08:00

AppBindRecord.java

…

AppErrorDialog.java

…

AppErrorResult.java

…

AppNotRespondingDialog.java

…

AppWaitingForDebuggerDialog.java

…

BackupRecord.java

…

BaseErrorDialog.java

…

BatteryStatsService.java

Add BatteryStats for Wifi Batched Scanning.

2013-11-06 17:43:18 -08:00

BroadcastFilter.java

…

BroadcastQueue.java

Remove unused imports from frameworks/base.

2013-11-20 11:31:47 -05:00

BroadcastRecord.java

…

CompatModeDialog.java

…

CompatModePackages.java

…

ConnectionRecord.java

Fix issue #11223338: Not retaining service started state while restarting

2013-11-06 16:42:17 -08:00

ContentProviderConnection.java

…

ContentProviderRecord.java

Remove unused imports from frameworks/base.

2013-11-20 11:31:47 -05:00

CoreSettingsObserver.java

…

EventLogTags.logtags

…

FactoryErrorDialog.java

…

IntentBindRecord.java

Remove unused imports from frameworks/base.

2013-11-20 11:31:47 -05:00

LaunchWarningWindow.java

…

NativeCrashListener.java

…

package.html

…

PendingIntentRecord.java

…

PendingThumbnailsRecord.java

…

ProcessList.java

Remove unused imports from frameworks/base.

2013-11-20 11:31:47 -05:00

ProcessMemInfo.java

…

ProcessRecord.java

Do not hold direct ref BatteryStatsImpl$Uid$Proc

2013-11-18 12:29:34 -08:00

ProcessStatsService.java

Remove unused imports from frameworks/base.

2013-11-20 11:31:47 -05:00

ProviderMap.java

…

ReceiverList.java

Remove unused imports from frameworks/base.

2013-11-20 11:31:47 -05:00

ServiceRecord.java

Introduce a Lifecycle for system services

2013-12-12 18:49:49 -08:00

StrictModeViolationDialog.java

…

TaskAccessInfo.java

…

TaskRecord.java

Fix issue #11050678: Large memory leak in ActivityStack

2013-10-04 16:44:22 -07:00

ThumbnailHolder.java

Fix issue #11050678: Large memory leak in ActivityStack

2013-10-04 16:44:22 -07:00

UriPermission.java

Throw when taking non-existant Uri permission.

2013-10-14 10:01:33 -07:00

UriPermissionOwner.java

…

UsageStatsService.java

Remove unused imports from frameworks/base.

2013-11-20 11:31:47 -05:00

UserStartedState.java

…