frameworks_base

resolved conflicts for merge of 8952a448 to master

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

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

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

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

Handle OPTIONS requests from SIP servers.

2010-09-24 00:53:10 +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

Fix alarms with negative or very large wakup times.

2010-03-31 15:38:08 -07:00

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

Switch the services library to using the new Slog

2010-03-01 13:06:50 -08:00

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

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

Add "dumpsys diskstats" to get a dump of disk-free values.

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

DockObserver.java

Refactor car mode.

2010-03-05 10:57:47 -08:00

DropBoxManagerService.java

Don't do single byte writes in DropBoxManagerService

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

EntropyService.java

Unittests for EntropyService. Make EntropyService more testable.

2010-03-19 16:57:21 -07:00

EventLogTags.logtags

…

HeadsetObserver.java

Switch the services library to using the new Slog

2010-03-01 13:06:50 -08:00

INativeDaemonConnectorCallbacks.java

…

InputApplication.java

Native input event dispatching.

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

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

Native input event dispatching.

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

Installer.java

DO NOT MERGE

2010-03-29 18:12:24 -07:00

IntentResolver.java

Rework permissions to be retained when an app is temporarily uninstalled.

2010-03-18 02:02:17 -07:00

LightsService.java

Resurrect flashlight support in obsolete IHardwareService Binder API.

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

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

DO NOT MERGE

2010-03-29 18:12:24 -07:00

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

Add "dumpsys diskstats" to get a dump of disk-free values.

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

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

Fix bug 2670395 and 2599698

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

PackageManagerBackupAgent.java

Workaround NPE caused by packages missing signatures.

2010-04-08 14:05:11 -07:00

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

Switch the services library to using the new Slog

2010-03-01 13:06:50 -08:00

RecognitionManagerService.java

Switch the services library to using the new Slog

2010-03-01 13:06:50 -08:00

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

API CHANGE: rename BackupHelperAgent => BackupAgentHelper per API Council

2010-03-29 15:48:14 -07:00

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

Reorder ThrottleService startup to avoid race.

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

TwilightCalculator.java

Fix calculation of the next twilight update for locations where the day or night never ends.

2010-02-23 06:04:33 +01:00

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

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

Split WifiStateMachine from WifiStateTracker

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

WindowManagerService.java

am 4b187e80: am 8e1b84e7: Merge "Some battery improvements:" into gingerbread

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