Dianne Hackborn 02d37b9731 resolved conflicts for merge of 892d11f4 to master ...

Change-Id: I21eca0002100d898e167a25aaa46d896deca2a11

2012-01-20 18:42:07 -08:00

..

accessibility

resolved conflicts for merge of 26f7a81f to master

2011-11-30 18:34:56 -08:00

am

Move where prop dev.bootcomplete is set

2012-01-12 17:39:40 -08:00

connectivity

am 1e9e7f76: am ff321d49: Merge "VPN: silence VPN notifications." into ics-mr1

2012-01-12 14:30:44 -08:00

location

Cherry-picking Id45abeba and Ia065dec6 for MR1

2011-12-13 14:02:32 -08:00

net

Move non-monotonic reporting to interface.

2012-01-10 17:24:44 -08:00

pm

Don't allow reading of packagelist files.

2012-01-06 13:58:01 -08:00

usb

…

wm

resolved conflicts for merge of 892d11f4 to master

2012-01-20 18:42:07 -08:00

AlarmManagerService.java

…

AppWidgetService.java

Workaround for issue where the notifyDatasetChanged call chain is broken when Launcher is killed. (Bug 5703782)

2011-12-06 14:21:10 -08:00

AttributeCache.java

…

BackupManagerService.java

Fix shared-storage full backup

2012-01-20 17:41:41 -08:00

BatteryService.java

…

BootReceiver.java

…

BrickReceiver.java

…

ClipboardService.java

…

ConnectivityService.java

Merge "Stop using shared DUN APN when tethering stops."

2012-01-20 14:35:41 -08:00

CountryDetectorService.java

Cherry-picking Id45abeba and Ia065dec6 for MR1

2011-12-13 14:02:32 -08:00

DevicePolicyManagerService.java

Fix 5863053: Add method to lock screen immediately.

2012-01-17 18:11:05 -08:00

DeviceStorageMonitorService.java

Fix free_cache to actually work

2011-12-01 09:07:55 -08:00

DiskStatsService.java

…

DockObserver.java

…

DropBoxManagerService.java

…

EntropyMixer.java

Rename EntropyService to EntropyMixer

2011-11-17 13:29:58 -08:00

EventLogTags.logtags

Expanding NotificationManager's event logging.

2011-11-29 23:48:29 -05:00

INativeDaemonConnectorCallbacks.java

…

InputMethodManagerService.java

Enable subtypes when the implicitly enabled subtype is not ascii capable keyboard

2012-01-11 17:03:03 +09:00

IntentResolver.java

…

LightsService.java

…

LocationManagerService.java

…

MasterClearReceiver.java

…

MountService.java

Log netd traffic nicely.

2012-01-20 10:37:11 -08:00

NativeDaemonConnector.java

Log netd traffic nicely.

2012-01-20 10:37:11 -08:00

NativeDaemonConnectorException.java

Move NativeDaemonConnector to varargs.

2011-11-29 12:09:06 -08:00

NativeDaemonEvent.java

Move native netd calls to varargs.

2011-12-02 13:08:26 -08:00

NetworkManagementService.java

Log netd traffic nicely.

2012-01-20 10:37:11 -08:00

NetworkTimeUpdateService.java

…

NotificationManagerService.java

Expanding NotificationManager's event logging.

2011-11-29 23:48:29 -05:00

NotificationPlayer.java

…

PackageManagerBackupAgent.java

…

PowerManagerService.java

am e2d76314: am 9b518d93: Merge "Fix issue #5642121: Proximity sensor didn\'t turn the screen on in call" into ics-mr1

2011-11-29 10:20:03 -08:00

PreferredComponent.java

…

ProcessMap.java

…

RandomBlock.java

…

RecognitionManagerService.java

…

SamplingProfilerService.java

…

ShutdownActivity.java

…

StatusBarManagerService.java

…

SystemBackupAgent.java

…

SystemServer.java

Rename EntropyService to EntropyMixer

2011-11-17 13:29:58 -08:00

TelephonyRegistry.java

…

TextServicesManagerService.java

Fix ConcurrentModificationException in TextServicesManagerService

2011-11-30 22:46:16 +09:00

ThrottleService.java

…

TwilightCalculator.java

…

UiModeManagerService.java

Add a new ui mode for "appliance"

2011-12-15 16:16:14 -08:00

VibratorService.java

…

WallpaperManagerService.java

Fix issue #5628789: Cannot set static/custom wallpaper after clearing Settings data

2011-11-29 18:01:50 -08:00

Watchdog.java

…

WifiService.java

Track scan count by UID

2011-12-14 10:58:49 -08:00

WiredAccessoryObserver.java

…