Kenny Root 027610a76e resolved conflicts for merge of 964eb438 to master ...

Change-Id: I0c54d6b88356d8734d7f51234b0114434414502e

2010-10-18 13:03:35 -07:00

..

ActivityManagerService.java

resolved conflicts for merge of 964eb438 to master

2010-10-18 13:03:35 -07:00

ActivityRecord.java

resolved conflicts for merge of efa4f7f8 to master

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

ActivityResult.java

…

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

…

AppErrorDialog.java

…

AppErrorResult.java

…

AppNotRespondingDialog.java

…

AppWaitingForDebuggerDialog.java

…

BackupRecord.java

…

BaseErrorDialog.java

…

BatteryStatsService.java

Update code for new BT APIs.

2010-09-28 20:02:12 -07:00

BroadcastFilter.java

…

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

…

ContentProviderRecord.java

…

DeviceMonitor.java

…

EventLogTags.logtags

…

FactoryErrorDialog.java

…

IntentBindRecord.java

…

LaunchWarningWindow.java

…

package.html

…

PendingIntentRecord.java

…

PendingThumbnailsRecord.java

…

ProcessRecord.java

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

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

ReceiverList.java

…

ServiceRecord.java

…

StrictModeViolationDialog.java

…

TaskRecord.java

…

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