Dianne Hackborn 004abb1223 resolved conflicts for merge of 3d7d3690 to master ...

Change-Id: I1d1d7a448b3ae8a86600addfa75f2448a98327bf

2010-09-03 14:07:25 -07:00

..

ActivityManagerService.java

resolved conflicts for merge of 3d7d3690 to master

2010-09-03 14:07:25 -07:00

ActivityRecord.java

Remove experimental immersive mode support. DO NOT MERGE

2010-08-27 22:57:39 -04:00

ActivityResult.java

Some ActivityThread/ActivityManager cleanup.

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

ActivityStack.java

Fix a small bug when granting permissions through activity results.

2010-09-01 22:55:02 -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

…

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

package.html

…

PendingIntentRecord.java

Refactor ActivityManagerService activity stack.

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

PendingThumbnailsRecord.java

…

ProcessRecord.java

Fix problems with determining when to kill apps for wake usage.

2010-08-15 17:27:29 -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