Dianne Hackborn e6634981f1 resolved conflicts for merge of 9c7489f8 to master ...

Change-Id: I1d8fd1146925f48ad690c89230d24dc8694703f4

2010-10-22 14:35:09 -07:00

..

ActivityManagerService.java

resolved conflicts for merge of 9c7489f8 to master

2010-10-22 14:35:09 -07:00

ActivityRecord.java

resolved conflicts for merge of efa4f7f8 to master

2010-10-08 11:09:38 -07:00

ActivityResult.java

Some ActivityThread/ActivityManager cleanup.

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

ActivityStack.java

Debug logs for issue #3101415: Apps seem to have their UID changed over time.

2010-10-15 11:22:17 -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

Update code for new BT APIs.

2010-09-28 20:02:12 -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

Work on issue #3062691: GPS enable bypass via com.android.settings.widget.SettingsAppWidgetProvider

2010-10-06 14:27:34 -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

Fix issue #3001368: API REVIEW: android.app.Activity

2010-10-05 18:07:54 -07:00

ReceiverList.java

donut snapshot

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

ServiceRecord.java

Crash apps when they provide bad notifications instead of crashing the system process.

2010-09-23 16:49:20 -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

Allow all apps to call ContentResolver.getType().

2010-09-27 18:05:44 -07:00

UriPermissionOwner.java

Implement permission granting in clipboard.

2010-10-05 14:09:08 -07:00

UsageStatsService.java

Work on issue #3101415: Crespo apps seem to have their UID changed over time.

2010-10-15 14:46:33 -07:00