Dianne Hackborn e6634981f1 resolved conflicts for merge of 9c7489f8 to master ...

Change-Id: I1d8fd1146925f48ad690c89230d24dc8694703f4

2010-10-22 14:35:09 -07:00

..

am

resolved conflicts for merge of 9c7489f8 to master

2010-10-22 14:35:09 -07:00

connectivity

resolved conflicts for merge of 368fdba4 to master

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

location

am d78c8d8b: am f6572e7e: Merge "GPS: Fix network type logic in requestRefLocation" into gingerbread

2010-10-22 09:17:38 -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

…

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

…

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

…

InputWindow.java

…

InputWindowList.java

…

Installer.java

…

IntentResolver.java

…

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

Fix isUsbMassStorageConnected() will always return true

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

NativeDaemonConnector.java

…

NativeDaemonConnectorException.java

…

NetStatService.java

…

NetworkManagementService.java

…

NetworkTimeUpdateService.java

…

NotificationManagerService.java

resolved conflicts for merge of 368fdba4 to master

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

NotificationPlayer.java

…

PackageManagerBackupAgent.java

…

PackageManagerService.java

Reorganize PackageManager dump to avoid NPE

2010-10-22 10:07:11 -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

…

RandomBlock.java

…

RecognitionManagerService.java

…

SamplingProfilerService.java

…

ShutdownActivity.java

…

StatusBarManagerService.java

Refactor SystemUI so the status bar isn't a Service of its own.

2010-10-21 15:42:34 -04:00

SystemBackupAgent.java

…

SystemServer.java

Refactor SystemUI so the status bar isn't a Service of its own.

2010-10-21 15:42:34 -04:00

TelephonyRegistry.java

Fix bug introduced in Change I856118d8.

2010-10-21 14:19:21 -07:00

ThrottleService.java

…

TwilightCalculator.java

…

UiModeManagerService.java

…

UsbObserver.java

…

VibratorService.java

…

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

…

WifiWatchdogService.java

…

WindowManagerService.java

am eb5aeae6: am fdbb2168: Merge "Adjust boundaries for screen sizes." into gingerbread

2010-10-21 20:27:30 -07:00