Dianne Hackborn dc71b9e4d6 resolved conflicts for merge of 6a3eddb4 to master ...

Change-Id: I1ca1d100274d4a733ef2bf58b0d5d7217b4f858e

2010-09-30 20:34:34 -07:00

..

am

resolved conflicts for merge of 6a3eddb4 to master

2010-09-30 20:34:34 -07:00

connectivity

DO NOT MERGE Tethering: Delay 1000ms before processing USB disconnect events

2010-09-19 14:04:38 -04:00

location

resolved conflicts for merge of 53b07027 to master

2010-09-30 18:43:52 -04:00

AccessibilityManagerService.java

…

AlarmManagerService.java

…

AppWidgetService.java

…

AttributeCache.java

…

BackupManagerService.java

…

BatteryService.java

…

BootReceiver.java

…

BrickReceiver.java

…

ClipboardService.java

…

ConnectivityService.java

resolved conflicts for merge of 6a3eddb4 to master

2010-09-30 20:34:34 -07:00

CountryDetectorService.java

…

DevicePolicyManagerService.java

resolved conflicts for merge of 6a3eddb4 to master

2010-09-30 20:34:34 -07:00

DeviceStorageMonitorService.java

…

DiskStatsService.java

…

DockObserver.java

…

DropBoxManagerService.java

Don't do single byte writes in DropBoxManagerService

2010-09-22 17:49:16 -07:00

EntropyService.java

squeeze a few more bits of randomness into /dev/random

2010-09-27 14:49:00 -07:00

EventLogTags.logtags

…

HeadsetObserver.java

…

INativeDaemonConnectorCallbacks.java

…

InputApplication.java

…

InputManager.java

Drag/drop APIs and infrastructure

2010-09-30 16:29:07 -07:00

InputMethodManagerService.java

resolved conflicts for merge of 6a3eddb4 to master

2010-09-30 20:34:34 -07:00

InputWindow.java

Make input dispatcher only ANR for foreground windows.

2010-09-15 18:52:08 -07:00

InputWindowList.java

…

Installer.java

…

IntentResolver.java

Rub in a little 'ol log-b-gone.

2010-09-30 18:27:22 -07:00

LightsService.java

…

LoadAverageService.java

…

LocationManagerService.java

resolved conflicts for merge of 53b07027 to master

2010-09-30 18:43:52 -04:00

MasterClearReceiver.java

…

MountService.java

am 8d85beca: am 8b28441a: Merge "Being already unmounted is not a failure" into gingerbread

2010-09-30 19:48:27 -07:00

NativeDaemonConnector.java

am 9c38a6dc: am e87ebb08: Merge "Cleanup Netd to prevent getting hung." into gingerbread

2010-09-23 09:40:20 -07:00

NativeDaemonConnectorException.java

…

NetStatService.java

…

NetworkManagementService.java

resolved conflicts for merge of 6a3eddb4 to master

2010-09-30 20:34:34 -07:00

NetworkTimeUpdateService.java

Provide automatic date/time based on NTP lookup.

2010-09-15 13:14:18 -07:00

NotificationManagerService.java

…

NotificationPlayer.java

…

PackageManagerBackupAgent.java

…

PackageManagerService.java

resolved conflicts for merge of 6a3eddb4 to master

2010-09-30 20:34:34 -07:00

PowerManagerService.java

am 0457db37: am ab2e6284: Merge "Use the private version of userActivity." into gingerbread

2010-09-30 19:48:31 -07:00

ProcessMap.java

…

ProcessStats.java

am 287952c3: Fix issue #3022508: Crash during media scan

2010-09-23 16:04:23 -07:00

RandomBlock.java

…

RecognitionManagerService.java

…

SamplingProfilerService.java

…

ShutdownActivity.java

…

StatusBarManagerService.java

…

SystemBackupAgent.java

…

SystemServer.java

resolved conflicts for merge of f4c3b7e9 to master

2010-09-29 12:20:51 -07:00

TelephonyRegistry.java

Add LinkCapabilities

2010-09-16 21:26:59 -07:00

ThrottleService.java

…

TwilightCalculator.java

…

UiModeManagerService.java

…

UsbObserver.java

…

VibratorService.java

…

ViewServer.java

…

WallpaperManagerService.java

Add missing wallpaper service lock.

2010-09-14 11:30:29 -07:00

Watchdog.java

…

WifiService.java

Wifi: Update code for new BT Apis.

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

WifiStateTracker.java

resolved conflicts for merge of 1f377298 to master

2010-09-17 23:12:26 -07:00

WifiWatchdogService.java

…

WindowManagerService.java

Drag/drop APIs and infrastructure

2010-09-30 16:29:07 -07:00