Robert Greenwalt f4a29403ae resolved conflicts for merge of 70c3d1c2 to honeycomb-plus-aosp ...

Change-Id: I0962138f6ecb1ed54fda25524d8850b086f13c4f

2011-04-07 14:13:52 -07:00

..

am

am 970bad67: am be368de7: Merge "Fix missing AOSP copyright headers for more files" into honeycomb-mr1

2011-03-17 18:00:19 -07:00

connectivity

DO NOT MERGE Pick upstream intf with valid IP conf

2011-03-25 10:09:55 -07:00

location

am a5b68f39: am 5982bf66: GPS: Restore XTRA downloading at boot.

2011-03-17 16:25:01 -07:00

usb

UsbService: Make USB disconnect handling for accessory mode more robust

2011-03-29 16:59:38 -07:00

wm

Merge "Fix 4027057: Improve resolution of RecentApps thumbnail images." into honeycomb-mr1

2011-03-09 14:42:56 -08:00

AccessibilityManagerService.java

…

AlarmManagerService.java

Align inexact alarms in both time bases; don't pull to wall time

2011-02-08 16:59:46 -08:00

AppWidgetService.java

Catching all Exceptions when calling through to RemoteViewsFactory

2011-03-16 16:33:53 -07:00

AttributeCache.java

…

BackupManagerService.java

Don't spuriously time out restore sessions

2011-03-03 17:30:32 -08:00

BatteryService.java

…

BootReceiver.java

…

BrickReceiver.java

…

ClipboardService.java

…

ConnectivityService.java

resolved conflicts for merge of 70c3d1c2 to honeycomb-plus-aosp

2011-04-07 14:13:52 -07:00

CountryDetectorService.java

…

DevicePolicyManagerService.java

Fix 3197205: Minor edits to device policy admin strings and documentation

2011-02-16 16:27:41 -08:00

DeviceStorageMonitorService.java

…

DiskStatsService.java

…

DockObserver.java

…

DropBoxManagerService.java

…

EntropyService.java

…

EventLogTags.logtags

…

INativeDaemonConnectorCallbacks.java

…

InputMethodManagerService.java

Remove a workaround for the data inconsistency of SystemProperties

2011-03-14 12:38:34 -07:00

Installer.java

Remove defunct secure FS work

2011-02-02 16:42:18 -08:00

IntentResolver.java

Implement issue #3426299: Introduce application "stopped" state

2011-02-25 14:46:27 -08:00

LightsService.java

…

LoadAverageService.java

…

LocationManagerService.java

…

MasterClearReceiver.java

…

MountService.java

am f7a34b15: am e558a000: Merge "Avoid crash in system server when mounting container"

2011-04-04 15:25:21 -07:00

NativeDaemonConnector.java

am 9204644d: Merge "Fix a race condition in NativeDaemonConnector"

2011-02-07 10:04:54 -08:00

NativeDaemonConnectorException.java

…

NetStatService.java

…

NetworkManagementService.java

Start using NetworkUtils.numericToInetAddress.

2011-03-02 11:37:32 -08:00

NetworkTimeUpdateService.java

Check for NTP time as soon as WIFI is connected.

2011-03-01 12:41:04 -08:00

NotificationManagerService.java

am 40bbf929: DO NOT MERGE: Backport USB accessory support to gingerbread

2011-03-02 15:16:32 -08:00

NotificationPlayer.java

…

PackageManagerBackupAgent.java

…

PackageManagerService.java

PACKAGE_FIRST_LAUNCH intent sent to wrong pkg

2011-03-16 23:12:31 -07:00

PowerManagerService.java

Start window manager refactoring.

2011-02-17 14:22:17 -08:00

PreferredComponent.java

Refector preferred activity code out of package manager.

2011-03-04 00:08:04 -08:00

ProcessMap.java

…

ProcessStats.java

…

RandomBlock.java

…

RecognitionManagerService.java

…

SamplingProfilerService.java

…

ShutdownActivity.java

…

StatusBarManagerService.java

Start window manager refactoring.

2011-02-17 14:22:17 -08:00

SystemBackupAgent.java

Start window manager refactoring.

2011-02-17 14:22:17 -08:00

SystemServer.java

DO NOT MERGE: Backport USB accessory support to gingerbread

2011-03-01 23:09:12 -08:00

TelephonyRegistry.java

…

ThrottleService.java

…

TwilightCalculator.java

…

UiModeManagerService.java

…

VibratorService.java

am 7a84a60d: am 1a5a2379: Merge "Unregister callback from binder when vibration is removed"

2011-03-30 08:20:51 -07:00

WallpaperManagerService.java

Start window manager refactoring.

2011-02-17 14:22:17 -08:00

Watchdog.java

…

WifiService.java

Backup and restore IP and proxy settings

2011-03-10 16:57:10 -08:00

WifiStateTracker.java

…

WifiWatchdogService.java

Fix wifi watchdog to use InetAddress

2011-02-16 10:37:50 -08:00

WiredAccessoryObserver.java

…