Dianne Hackborn f41d25a2f5 resolved conflicts for merge of 8bb779bd to master ...

Change-Id: I72ddc0a67cf55d45958a622ffe535f32c1721052

2012-09-12 10:55:03 -07:00

..

ActiveServices.java

Flesh out multi-user in am commands.

2012-09-10 14:52:30 -07:00

ActivityManagerService.java

resolved conflicts for merge of 8bb779bd to master

2012-09-12 10:55:03 -07:00

ActivityRecord.java

Various fixes.

2012-09-09 18:14:32 -07:00

ActivityResult.java

…

ActivityStack.java

am aaf7fdbf: am 01a7c79d: Merge "Various fixes." into jb-mr1-dev

2012-09-10 17:12:48 -07:00

AppBindRecord.java

…

AppErrorDialog.java

…

AppErrorResult.java

…

AppNotRespondingDialog.java

…

AppWaitingForDebuggerDialog.java

…

BackupRecord.java

…

BaseErrorDialog.java

…

BatteryStatsService.java

Include WIFI scan's in Battery Stats.

2012-06-15 16:10:38 -07:00

BroadcastFilter.java

Add registering for explicit users.

2012-09-04 10:39:21 -07:00

BroadcastQueue.java

Add registering for explicit users.

2012-09-04 10:39:21 -07:00

BroadcastRecord.java

Relax permission requirement for sending broadcasts to other users

2012-08-27 19:30:30 -07:00

CompatModeDialog.java

…

CompatModePackages.java

Make AtomicFile a public API. It's about time!

2012-07-31 17:54:52 -07:00

ConnectionRecord.java

Improve multi-user app management.

2012-08-21 10:34:20 -07:00

ContentProviderConnection.java

Add time stamp to content provider connection.

2012-05-30 15:29:36 -07:00

ContentProviderRecord.java

Fix crash when setting wallpaper from non-primary user.

2012-09-07 15:50:26 -07:00

CoreSettingsObserver.java

…

DeviceMonitor.java

restorecon /data/anr directory.

2012-08-20 06:08:01 -04:00

EventLogTags.logtags

…

FactoryErrorDialog.java

…

IntentBindRecord.java

Improve multi-user app management.

2012-08-21 10:34:20 -07:00

LaunchWarningWindow.java

…

package.html

…

PendingIntentRecord.java

More multi-user stuff:

2012-09-07 13:55:23 -07:00

PendingThumbnailsRecord.java

…

ProcessList.java

Introduce multiple displays with DisplayContent.

2012-08-02 08:47:44 -07:00

ProcessRecord.java

Rename UserId to UserHandle.

2012-08-16 12:46:38 -07:00

ProviderMap.java

Various fixes.

2012-09-09 18:14:32 -07:00

ReceiverList.java

Add registering for explicit users.

2012-09-04 10:39:21 -07:00

ServiceRecord.java

Remove Binder.getOrigCallingUid().

2012-08-31 15:11:13 -07:00

StrictModeViolationDialog.java

…

TaskAccessInfo.java

…

TaskRecord.java

Rename UserId to UserHandle.

2012-08-16 12:46:38 -07:00

ThumbnailHolder.java

…

TransferPipe.java

…

UriPermission.java

DO NOT MERGE: Cherry-pick 2ed524966d to JB.

2012-06-11 13:06:41 -07:00

UriPermissionOwner.java

…

UsageStatsService.java

Make AtomicFile a public API. It's about time!

2012-07-31 17:54:52 -07:00

UserStartedState.java

Start implementing concept of "running" users.

2012-08-28 16:30:55 -07:00