Brad Fitzpatrick 385a753dea resolved conflicts for merge of 368fdba4 to master ...

Change-Id: I42b7b433c86a71a5da5db67109f056a280077c9d

2010-10-21 07:39:10 -07:00

..

am

resolved conflicts for merge of 964eb438 to master

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

connectivity

resolved conflicts for merge of 368fdba4 to master

2010-10-21 07:39:10 -07:00

location

resolved conflicts for merge of 368fdba4 to master

2010-10-21 07:39:10 -07:00

AccessibilityManagerService.java

…

AlarmManagerService.java

am fb1e5529: Merge "Fix time zone info in kernel is nothing after reboot"

2010-10-10 18:37:37 -07:00

AppWidgetService.java

…

AttributeCache.java

…

BackupManagerService.java

resolved conflicts for merge of 368fdba4 to master

2010-10-21 07:39:10 -07:00

BatteryService.java

am 13e46665: am 736f5ec4: Merge "Work on issue #3101415: Crespo apps seem to have their UID changed over time." into gingerbread

2010-10-18 08:04:47 -07:00

BootReceiver.java

…

BrickReceiver.java

…

ClipboardService.java

Implement permission granting in clipboard.

2010-10-05 14:09:08 -07:00

ConnectivityService.java

am 83d97f46: am 96619f9f: Merge "Add some error-case logging." into gingerbread

2010-10-11 10:49:47 -07:00

CountryDetectorService.java

…

DevicePolicyManagerService.java

resolved conflicts for merge of 964eb438 to master

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

DeviceStorageMonitorService.java

…

DiskStatsService.java

…

DockObserver.java

…

DropBoxManagerService.java

Work on issue #3101415: Crespo apps seem to have their UID changed over time.

2010-10-15 14:46:33 -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

Fix an event injection bug when the policy is bypassed.

2010-10-11 17:54:12 -07:00

InputMethodManagerService.java

Add a cancel button to InputMethodPicker and InputMethodSubtypePicker

2010-10-08 13:49:28 +09:00

InputWindow.java

Make input dispatcher only ANR for foreground windows.

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

InputWindowList.java

…

Installer.java

Symlink application lib directory when on SD card

2010-10-07 17:20:26 -07:00

IntentResolver.java

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

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

LightsService.java

…

LoadAverageService.java

Add support for secure system overlays.

2010-10-15 17:10:55 -07:00

LocationManagerService.java

am 11eada78: am ba2ec2b4: Merge "Enable framework GPS and location manager logging" into gingerbread

2010-10-19 09:54:42 -07:00

MasterClearReceiver.java

Implement issue #3094621 and #3094609 - wipe sd card

2010-10-16 16:32:15 -07:00

MountService.java

am 8fda1636: am bdf8034c: Merge "OBB: use PBKDF2 for key generation." into gingerbread

2010-10-15 14:00:58 -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

resolved conflicts for merge of 368fdba4 to master

2010-10-21 07:39:10 -07:00

NotificationPlayer.java

…

PackageManagerBackupAgent.java

…

PackageManagerService.java

resolved conflicts for merge of 368fdba4 to master

2010-10-21 07:39:10 -07:00

PowerManagerService.java

am 5747eebf: am a8d477f0: Merge "Pressing the power button quickly needs to turn the screen on and off correctly." into gingerbread

2010-10-19 09:53:47 -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

resolved conflicts for merge of 368fdba4 to master

2010-10-21 07:39:10 -07:00

SystemBackupAgent.java

…

SystemServer.java

Fix race condition between starting of service and getting the Profile Proxy.

2010-10-18 15:32:11 -07:00

TelephonyRegistry.java

resolved conflicts for merge of 368fdba4 to master

2010-10-21 07:39:10 -07:00

ThrottleService.java

…

TwilightCalculator.java

…

UiModeManagerService.java

…

UsbObserver.java

…

VibratorService.java

Track client requests through location manager.

2010-09-13 14:20:48 -07:00

ViewServer.java

…

WallpaperManagerService.java

Work on issue #3101415: Crespo apps seem to have their UID changed over time.

2010-10-15 14:46:33 -07:00

Watchdog.java

…

WifiService.java

resolved conflicts for merge of 368fdba4 to master

2010-10-21 07:39:10 -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 changes

2010-10-15 20:30:32 -07:00