Hung-ying Tyan 22a62d1342 resolved conflicts for merge of ee813bae to master ...

Change-Id: I84ca961fb18b29313b5ec6041a79ca87a1a1cd68

2010-09-24 13:45:43 +08:00

..

am

am 982c07e9: am cbb7b05e: Merge "Crash apps when they provide bad notifications instead of crashing the system process." into gingerbread

2010-09-23 21:40:24 -07:00

connectivity

DO NOT MERGE Tethering: Delay 1000ms before processing USB disconnect events

2010-09-19 14:04:38 -04:00

location

am 6cec0dc0: am 32371695: Merge "GpsLocationProvider: Fix race condition while bringing up APN for SUPL." into gingerbread

2010-09-22 10:01:48 -07:00

sip

Refactoring SIP classes to get ready for API review.

2010-09-24 10:06:59 +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

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

am f532e958: am 6548f395: Merge "Inet status bug fix" into gingerbread

2010-09-21 10:44:26 -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

Don't do single byte writes in DropBoxManagerService

2010-09-22 17:49:16 -07:00

EntropyService.java

…

EventLogTags.logtags

…

HeadsetObserver.java

…

INativeDaemonConnectorCallbacks.java

…

InputApplication.java

…

InputManager.java

Fix race reading input configuration during system startup.

2010-09-21 18:22:55 -07:00

InputMethodManagerService.java

Add methods for managing subtypes

2010-09-23 16:25:07 +09: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

am 24956d36: am 307aef01: Merge "LocationManager: Hide location provider and geocode provider APIs." into gingerbread

2010-09-20 19:33:58 -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 9c38a6dc: am e87ebb08: Merge "Cleanup Netd to prevent getting hung." into gingerbread

2010-09-23 09:40:20 -07:00

NativeDaemonConnectorException.java

…

NetStatService.java

…

NetworkManagementService.java

am 9c38a6dc: am e87ebb08: Merge "Cleanup Netd to prevent getting hung." into gingerbread

2010-09-23 09:40:20 -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 65b5a65e: am 4db643eb: Merge "In theory the package manager now scans /vendor/app" into gingerbread

2010-09-20 19:33:46 -07:00

PowerManagerService.java

am abdd2c7f: am 95f600b5: Merge "Fix NPE in PowerManagerService on boot, if some settings are corrupted." into gingerbread

2010-09-22 17:06:48 -07:00

ProcessMap.java

…

ProcessStats.java

am 287952c3: Fix issue #3022508: Crash during media scan

2010-09-23 16:04:23 -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

am 9c38a6dc: am e87ebb08: Merge "Cleanup Netd to prevent getting hung." into gingerbread

2010-09-23 09:40:20 -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

Add Wifi Protected Setup support

2010-09-23 09:13:34 -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 4b187e80: am 8e1b84e7: Merge "Some battery improvements:" into gingerbread

2010-09-20 19:33:06 -07:00