Hung-ying Tyan 2417132611 am 37d1b249: am 97963794: SIP: convert enum to static final int. ...

Merge commit '37d1b2496ed4e636062d8bb451e723b975c80920'

* commit '37d1b2496ed4e636062d8bb451e723b975c80920':
  SIP: convert enum to static final int.

2010-09-19 18:59:43 -07: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: convert enum to static final int.

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

AccessibilityManagerService.java

…

AlarmManagerService.java

…

AppWidgetService.java

…

AttributeCache.java

…

BackupManagerService.java

Track client requests through location manager.

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

BatteryService.java

…

BootReceiver.java

…

BrickReceiver.java

…

ClipboardService.java

…

ConnectivityService.java

Enhance http proxy support

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

CountryDetectorService.java

…

DevicePolicyManagerService.java

…

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

…

EntropyService.java

…

EventLogTags.logtags

…

HeadsetObserver.java

…

INativeDaemonConnectorCallbacks.java

…

InputApplication.java

…

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

…

Installer.java

…

IntentResolver.java

…

LightsService.java

…

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

…

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

…

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

…

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

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

…

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