Mike Lockwood 6327a9fece resolved conflicts for merge of 2f65a99f to gingerbread-plus-aosp ...

Change-Id: I9830756577dc6a64b03bc2be8788986d9034b059

2010-10-05 16:00:13 -04:00

..

am

am 6f7e10ca: Merge "Make it easier to figure out whether an app can go on sd card." into gingerbread

2010-10-04 23:04:53 -07:00

connectivity

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

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

location

GPS: Add support for AGpsRilInterface.

2010-10-05 13:15:37 -04:00

AccessibilityManagerService.java

…

AlarmManagerService.java

Fix alarms with negative or very large wakup times.

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

AppWidgetService.java

Just disable widgets that come from apps on sd cards, because they don't work anyway.

2010-08-24 17:02:09 -04: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

…

ConnectivityService.java

am 0a69f597: Merge "Rub in a little \'ol log-b-gone." into gingerbread

2010-09-30 19:12:11 -07:00

DemoDataSet.java

…

DevicePolicyManagerService.java

Rub in a little 'ol log-b-gone.

2010-09-30 18:27:22 -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

…

DropBoxManagerService.java

Don't do single byte writes in DropBoxManagerService

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

EntropyService.java

squeeze a few more bits of randomness into /dev/random

2010-09-27 14:49:00 -07:00

EventLogTags.logtags

…

HeadsetObserver.java

…

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

Rub in a little 'ol log-b-gone.

2010-09-30 18:27:22 -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

DO NOT MERGE

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

IntentResolver.java

Rub in a little 'ol log-b-gone.

2010-09-30 18:27:22 -07:00

LightsService.java

Resurrect flashlight support in obsolete IHardwareService Binder API.

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

LoadAverageService.java

…

LocationManagerService.java

location: rebind to network location and geocoder services after package update

2010-09-30 15:25:54 -04:00

MasterClearReceiver.java

DO NOT MERGE

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

MountService.java

am d9e88d22: Merge "Add "none" for vold and deprecate mkobb -c" into gingerbread

2010-10-01 15:11:22 -07:00

NativeDaemonConnector.java

Cleanup Netd to prevent getting hung.

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

Rub in a little 'ol log-b-gone.

2010-09-30 18:27:22 -07:00

NotificationManagerService.java

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:05:38 -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

Don't write settings multiple times when unmounting.

2010-10-02 19:06:18 -07:00

PowerManagerService.java

Use the private version of userActivity.

2010-09-30 16:47:09 -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

…

ShutdownActivity.java

…

StatusBarManagerService.java

Make bad notifications crash their application.

2010-06-24 17:27:28 -07:00

SystemBackupAgent.java

API CHANGE: rename BackupHelperAgent => BackupAgentHelper per API Council

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

SystemServer.java

NFC integration

2010-09-28 22:36:27 -07:00

TelephonyRegistry.java

DO NOT MERGE Fixing Connectivity

2010-08-20 10:01:55 -07:00

ThrottleService.java

Cut logging, boost efficiency of ThrottleService

2010-06-07 16:43: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

Add new Usb.ACTION_USB_STATE sticky broadcast for monitoring USB connect state

2010-06-28 10:02:05 -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

Remove logging on wifilock acquire/release

2010-09-28 10:13:14 -07:00

WifiWatchdogService.java

do not merge: cherry-picked 929b4855b8 from master branch

2010-06-10 10:39:42 -07:00

WindowManagerService.java

am 458fc5f5: Merge "Fix issue #3041660: Camera image flips upside down when rotating device" into gingerbread

2010-10-04 14:55:09 -07:00