Kenny Root add582122d resolved conflicts for merge of 485d7a31 to master ...

Change-Id: I058e19af8732df44457bdc614ee810a642dc25e4

2013-05-07 09:51:31 -07:00

..

ActiveServices.java

Prepare ActivityManagerService for multiple stacks.

2013-03-06 13:57:26 -08:00

ActivityManagerService.java

resolved conflicts for merge of 485d7a31 to master

2013-05-07 09:51:31 -07:00

ActivityRecord.java

Call ensureActivitiesVisibleLocked from supervisor.

2013-05-06 13:12:58 -07:00

ActivityResult.java

…

ActivityStack.java

resolved conflicts for merge of 485d7a31 to master

2013-05-07 09:51:31 -07:00

ActivityStackSupervisor.java

Call ensureActivitiesVisibleLocked from supervisor.

2013-05-06 13:12:58 -07:00

AppBindRecord.java

…

AppErrorDialog.java

Fix resource reading for secondary users

2012-10-07 15:56:34 -07:00

AppErrorResult.java

…

AppNotRespondingDialog.java

Fix resource reading for secondary users

2012-10-07 15:56:34 -07:00

AppWaitingForDebuggerDialog.java

Fix issue #6968859: home not exiting an ANR'd dream

2012-10-04 12:04:58 -07:00

BackupRecord.java

…

BaseErrorDialog.java

Fix issue #6968859: home not exiting an ANR'd dream

2012-10-04 12:04:58 -07:00

BatteryStatsService.java

Better --unplugged support when dumping battery.

2013-04-30 13:33:18 -07:00

BroadcastFilter.java

Maybe fix issue #7211766: bindService() to User u0 While u10 is...

2012-09-26 14:50:12 -07:00

BroadcastQueue.java

Fix issue #8470131: Process thrash kills battery

2013-03-25 17:49:36 -07:00

BroadcastRecord.java

Fix issue #8470131: Process thrash kills battery

2013-03-25 17:49:36 -07:00

CompatModeDialog.java

…

CompatModePackages.java

Refactoring Activity Manager.

2013-04-22 09:12:38 -07:00

ConnectionRecord.java

Maybe fix issue #7211766: bindService() to User u0 While u10 is...

2012-09-26 14:50:12 -07:00

ContentProviderConnection.java

…

ContentProviderRecord.java

Maybe fix issue #7211766: bindService() to User u0 While u10 is...

2012-09-26 14:50:12 -07:00

CoreSettingsObserver.java

…

DeviceMonitor.java

…

EventLogTags.logtags

Merge "Reduce verbosity of service event logging." into jb-mr1.1-dev

2012-11-15 11:44:13 -08:00

FactoryErrorDialog.java

Fix issue #6968859: home not exiting an ANR'd dream

2012-10-04 12:04:58 -07:00

IntentBindRecord.java

…

LaunchWarningWindow.java

…

NativeCrashListener.java

Don't attempt native crash reporting for persistent apps

2013-04-19 17:39:20 -07:00

package.html

Correct executable bit for source files

2012-11-07 10:27:31 -08:00

PendingIntentRecord.java

Prepare ActivityManagerService for multiple stacks.

2013-03-06 13:57:26 -08:00

PendingThumbnailsRecord.java

Revert ActivityManager changes for tasks. DO NOT MERGE

2013-02-25 17:07:39 -08:00

ProcessList.java

Crank up the mOomMinFreeHigh values by 50%.

2013-03-27 17:36:13 -07:00

ProcessRecord.java

debuggerd now notifies the Activity Manager about native crashes

2013-04-01 13:50:23 -07:00

ProviderMap.java

…

ReceiverList.java

…

ServiceRecord.java

Fix issue #8798662: NPE in...

2013-05-03 12:07:51 -07:00

StrictModeViolationDialog.java

Fix issue #7211769 and #7244492, thrash around on #7226656.

2012-09-28 15:37:22 -07:00

TaskAccessInfo.java

…

TaskRecord.java

Move task methods into TaskRecord.

2013-04-29 17:05:56 -07:00

ThumbnailHolder.java

…

TransferPipe.java

…

UriPermission.java

External storage provider, document picker UI.

2013-05-01 17:44:42 -07:00

UriPermissionOwner.java

Support persistable Uri permission grants.

2013-04-15 12:34:40 -07:00

UsageStatsService.java

Implement multi-user PackageMonitor.

2012-09-20 14:53:18 -07:00

UserStartedState.java

Framework side of issue #7302511: GCM client needs to use new framework API...

2012-10-08 14:33:47 -07:00