Dianne Hackborn 004abb1223 resolved conflicts for merge of 3d7d3690 to master ...

Change-Id: I1d1d7a448b3ae8a86600addfa75f2448a98327bf

2010-09-03 14:07:25 -07:00

..

am

resolved conflicts for merge of 3d7d3690 to master

2010-09-03 14:07:25 -07:00

connectivity

Tethering: Delay 1000ms before processing USB disconnect events

2010-08-23 14:50:49 -04:00

location

am 26434836: am b6ef8bad: Merge "GPS: Initialize XTRA support when GPS is enabled" into gingerbread

2010-08-17 04:56:32 -07:00

sip

SipService: reduce the usage of javax.sdp.*.

2010-09-02 22:15:26 +08:00

AccessibilityManagerService.java

…

AlarmManagerService.java

…

AppWidgetService.java

am 8f0f1b1e: am 274ad982: Merge "Just disable widgets that come from apps on sd cards, because they don\'t work anyway." into gingerbread

2010-08-26 15:52:07 -07:00

AttributeCache.java

…

BackupManagerService.java

…

BatteryService.java

am d3e803ae: Revert "Shutdown when capacity is 0% and no charging or when battery is dead"

2010-08-31 12:45:02 -07:00

BootReceiver.java

Renaming SharedPreferences$Editor.startCommit to apply

2010-08-30 18:10:49 -07:00

BrickReceiver.java

…

ClipboardService.java

Improve clipboard API.

2010-08-27 11:06:01 -07:00

ConnectivityService.java

Fix and simplify ConnectivityService singleton.

2010-09-02 19:23:52 -07:00

CountryDetectorService.java

…

DevicePolicyManagerService.java

…

DeviceStorageMonitorService.java

…

DiskStatsService.java

…

DockObserver.java

…

DropBoxManagerService.java

…

EntropyService.java

…

EventLogTags.logtags

…

HeadsetObserver.java

…

INativeDaemonConnectorCallbacks.java

…

InputApplication.java

…

InputManager.java

Input device calibration and capabilities.

2010-08-30 18:16:43 -07:00

InputMethodManagerService.java

DO NOT MERGE. Backport master InputMethodManagerService.java to gingerbread

2010-08-26 22:53:07 +09:00

InputWindow.java

…

InputWindowList.java

…

Installer.java

…

IntentResolver.java

…

LightsService.java

…

LoadAverageService.java

…

LocationManagerService.java

am d71021cb: am 0c731f99: Merge "Send broadcast intent when configured location providers change." into gingerbread

2010-08-27 18:10:38 -07:00

MasterClearReceiver.java

…

MountService.java

am 0eec8948: am 305bcbf0: Decrease PackageManagerService wait time for vold

2010-09-03 09:58:51 -07:00

NativeDaemonConnector.java

am fb79b7da: am 12da9d74: Fix buffer compacting in NativeDaemonConnector

2010-09-02 22:32:39 -07:00

NativeDaemonConnectorException.java

…

NetStatService.java

…

NetworkManagementService.java

am 0eec8948: am 305bcbf0: Decrease PackageManagerService wait time for vold

2010-09-03 09:58:51 -07:00

NotificationManagerService.java

am 5085848d: am 209e6518: Merge "Make the LED colors when charging customizable by the vendor"

2010-08-17 07:51:51 -07:00

NotificationPlayer.java

…

PackageManagerBackupAgent.java

…

PackageManagerService.java

am e7884d68: am d85621c9: Don\'t crash when extra logging is enabled.

2010-09-03 11:54:31 -07:00

PowerManagerService.java

Fix 2579224: Add a separate timeout for lockscreen vs display

2010-09-01 21:00:30 -07:00

ProcessMap.java

…

ProcessStats.java

am 22cd420b: Merge "Improve debug output when an ANR happens." into gingerbread

2010-08-31 18:58:47 -07:00

RandomBlock.java

…

RecognitionManagerService.java

…

SamplingProfilerService.java

…

ShutdownActivity.java

…

StatusBarManagerService.java

…

SystemBackupAgent.java

…

SystemServer.java

resolved conflicts for merge of 3e4975a5 to master

2010-09-02 09:56:04 +08:00

TelephonyRegistry.java

Rename NetworkProperties to LinkProperties

2010-08-30 15:54:37 -07:00

ThrottleService.java

…

TwilightCalculator.java

…

UiModeManagerService.java

…

UsbObserver.java

…

VibratorService.java

…

ViewServer.java

…

WallpaperManagerService.java

…

Watchdog.java

Improve debug output when an ANR happens.

2010-08-31 18:51:27 -07:00

WifiService.java

Updated documentation for upcoming fix for @code tags

2010-08-26 14:02:20 -07:00

WifiWatchdogService.java

…

WindowManagerService.java

am 36f0cb26: am 8d60866e: Input device calibration and capabilities.

2010-08-30 18:29:12 -07:00