Jean-Baptiste Queru 66a5d695ed resolved conflicts for merge of b4ae2f1b to gingerbread-plus-aosp ...

Change-Id: I9d4e2649375d9262efe8aaade0778f638d04afa8

2010-10-25 17:27:16 -07:00

..

ActivityManagerService.java

am 38993d8d: Merge "Fix issue #3122240: Expose xlarge in GB." into gingerbread

2010-10-22 14:03:08 -07:00

ActivityRecord.java

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

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

ActivityResult.java

Some ActivityThread/ActivityManager cleanup.

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

ActivityStack.java

resolved conflicts for merge of b4ae2f1b to gingerbread-plus-aosp

2010-10-25 17:27:16 -07:00

AppBindRecord.java

…

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

Improve power tracking of WIFI use.

2010-09-17 15:14:57 -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

…

LaunchWarningWindow.java

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

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

package.html

…

PendingIntentRecord.java

Refactor ActivityManagerService activity stack.

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

PendingThumbnailsRecord.java

…

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

…

UriPermission.java

Allow all apps to call ContentResolver.getType().

2010-09-26 21:31:47 -07:00

UriPermissionOwner.java

Don't retain global ref to last inflated context.

2010-08-25 21:50:54 -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