Dianne Hackborn 203e9529c5 resolved conflicts for merge of 62d005ec to master ...

Change-Id: I552d7adffe70a2bd94113ffb70cdc3e625fca0bd

2010-09-09 23:06:27 -07:00

..

ActivityManagerService.java

resolved conflicts for merge of 62d005ec to master

2010-09-09 23:06:27 -07:00

ActivityRecord.java

resolved conflicts for merge of 62d005ec to master

2010-09-09 23:06:27 -07:00

ActivityResult.java

Some ActivityThread/ActivityManager cleanup.

2010-06-24 15:20:48 -07:00

ActivityStack.java

Add toast when an app intercepts the launch of another app.

2010-09-09 21:25:35 -07:00

AppBindRecord.java

donut snapshot

2009-05-20 11:28:04 -07:00

AppErrorDialog.java

More StrictMode work, handling violations in ActivityManagerService.

2010-06-11 16:11:26 -07:00

AppErrorResult.java

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

AppNotRespondingDialog.java

Some ActivityThread/ActivityManager cleanup.

2010-06-24 15:20:48 -07:00

AppWaitingForDebuggerDialog.java

replaced deprecated setButton Methods

2010-07-20 08:46:17 +02:00

BackupRecord.java

Switch the services library to using the new Slog

2010-03-01 13:06:50 -08:00

BaseErrorDialog.java

Switch the services library to using the new Slog

2010-03-01 13:06:50 -08:00

BatteryStatsService.java

Various battery info things:

2010-08-13 15:17:49 -07:00

BroadcastFilter.java

Debugging for issue #2250075: Desk dock clock app sometimes doesn't

2009-11-11 17:51:41 -08:00

BroadcastRecord.java

Fix bugs with granting permissions through onNewIntent().

2010-08-20 11:50:00 -07:00

ConnectionRecord.java

Some ActivityThread/ActivityManager cleanup.

2010-06-24 15:20:48 -07:00

ContentProviderRecord.java

Fix bug in reporting a processes's dependent component.

2010-06-07 11:01:29 -07:00

DeviceMonitor.java

Switch the services library to using the new Slog

2010-03-01 13:06:50 -08:00

EventLogTags.logtags

Add new method call back in MountService.

2010-03-22 10:49:49 -07:00

FactoryErrorDialog.java

replaced deprecated setButton Methods

2010-07-20 08:46:17 +02:00

IntentBindRecord.java

donut snapshot

2009-05-20 11:28:04 -07:00

LaunchWarningWindow.java

Add toast when an app intercepts the launch of another app.

2010-09-09 21:25:35 -07:00

package.html

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

PendingIntentRecord.java

Refactor ActivityManagerService activity stack.

2010-06-25 13:07:21 -07:00

PendingThumbnailsRecord.java

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

ProcessRecord.java

People holding partial wake locks now get blamed for CPU usage.

2010-09-08 12:41:24 -07:00

ReceiverList.java

donut snapshot

2009-07-21 11:16:54 -07:00

ServiceRecord.java

Don't retain global ref to last inflated context.

2010-08-25 21:50:54 -07:00

StrictModeViolationDialog.java

More StrictMode work, handling violations in ActivityManagerService.

2010-06-11 16:11:26 -07:00

TaskRecord.java

donut snapshot

2009-05-20 11:28:04 -07:00

UriPermission.java

Don't retain global ref to last inflated context.

2010-08-25 21:50:54 -07:00

UriPermissionOwner.java

Don't retain global ref to last inflated context.

2010-08-25 21:50:54 -07:00

UsageStatsService.java

Usage Stats: don't block writing stats to disk.

2010-08-03 15:41:05 -07:00