Hung-ying Tyan 03d8a8f1f7 resolved conflicts for merge of cf1620d6 to master ...

Change-Id: I7a1436ec4c6a96801c096f61e9dc3571c1927cae

2010-09-20 09:31:12 +08:00

..

am

resolved conflicts for merge of 1f377298 to master

2010-09-17 23:12:26 -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 53686433 to master

2010-09-13 16:56:10 -07:00

sip

SIP: add config flag for wifi-only configuration.

2010-09-20 08:03:20 +08:00

AccessibilityManagerService.java

2593833 AccessibilityManager not properly initialized immediately upon registration in the AccessibilityManagerService

2010-04-13 18:41:17 -07:00

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

Track client requests through location manager.

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

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

Enhance http proxy support

2010-09-17 16:14:10 -07:00

CountryDetectorService.java

Add new system service CountryDetector

2010-07-28 09:45:57 +08:00

DevicePolicyManagerService.java

Device Policy Manager changes to enable Global Proxy.

2010-08-04 16:01:56 -07:00

DeviceStorageMonitorService.java

Allow incoming SMS until internal storage is almost full.

2010-09-08 12:37:18 -07:00

DiskStatsService.java

…

DockObserver.java

…

DropBoxManagerService.java

Remove a log message Jason doesn't like

2010-07-26 15:32:00 -07:00

EntropyService.java

…

EventLogTags.logtags

…

HeadsetObserver.java

…

INativeDaemonConnectorCallbacks.java

…

InputApplication.java

Native input event dispatching.

2010-06-28 19:10:54 -07:00

InputManager.java

Make input dispatcher only ANR for foreground windows.

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

InputMethodManagerService.java

Input dispatcher ANR handling enhancements.

2010-09-12 16:52:03 -07:00

InputWindow.java

Make input dispatcher only ANR for foreground windows.

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

InputWindowList.java

Native input event dispatching.

2010-06-28 19:10:54 -07:00

Installer.java

…

IntentResolver.java

…

LightsService.java

Resurrect flashlight support in obsolete IHardwareService Binder API.

2010-05-17 17:47:20 -04:00

LoadAverageService.java

…

LocationManagerService.java

resolved conflicts for merge of 53686433 to master

2010-09-13 16:56:10 -07:00

MasterClearReceiver.java

…

MountService.java

am 79a1ee42: am cee0b97e: Merge "Free AssetManager weak refs before unmounting" into gingerbread

2010-09-15 16:32:45 -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

NetworkTimeUpdateService.java

Provide automatic date/time based on NTP lookup.

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

NotificationManagerService.java

am 91cf049f: am 76e4fa19: Merge "Only pulse notification light if a new notification has been received since the screen was last turned off" into gingerbread

2010-09-09 16:10:00 -07:00

NotificationPlayer.java

Fix bug 2670395 and 2599698

2010-05-11 09:20:49 -07:00

PackageManagerBackupAgent.java

…

PackageManagerService.java

am 3ca26914: am 30434415: Merge "Dedupe timestamp in PackageSettings" into gingerbread

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

PowerManagerService.java

am 227afd3a: am 1188f5e7: Merge "Fix problem where power manager was calling battery stats with bad wl type." into gingerbread

2010-09-15 11:38:47 -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

wire up sampling profiler to dropbox

2010-06-14 13:27:01 -07:00

ShutdownActivity.java

Fix Intent.ACTION_REBOOT

2010-09-08 07:47:03 -04:00

StatusBarManagerService.java

Connect my plumbing to dsandler's awesome lights out mode.

2010-09-12 17:06:01 -04:00

SystemBackupAgent.java

…

SystemServer.java

Provide automatic date/time based on NTP lookup.

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

TelephonyRegistry.java

Add LinkCapabilities

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

ThrottleService.java

Reorder ThrottleService startup to avoid race.

2010-06-16 14:42:16 -07:00

TwilightCalculator.java

…

UiModeManagerService.java

am 57f4503e: Work on issue # 2778549: Idle FRF72 is awake 18 mins more than ERE27 in 13hr test

2010-06-17 18:43:31 -07:00

UsbObserver.java

Send Intents when PTP compatible devices are connected/disconnected to USB

2010-07-27 19:20:15 -04:00

VibratorService.java

Track client requests through location manager.

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

ViewServer.java

Adding a way for Hierarchy Viewer to get the focused window.

2010-08-06 13:27:31 -07:00

WallpaperManagerService.java

Add missing wallpaper service lock.

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

Watchdog.java

Improve debug output when an ANR happens.

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

WifiService.java

resolved conflicts for merge of 1f377298 to master

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

WifiStateTracker.java

resolved conflicts for merge of 1f377298 to master

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

WifiWatchdogService.java

Split WifiStateMachine from WifiStateTracker

2010-08-10 15:18:25 -07:00

WindowManagerService.java

am 7642c82c: am f4d788c9: Merge "Make input dispatcher only ANR for foreground windows." into gingerbread

2010-09-15 21:42:28 -07:00