Adam Powell b9eab6c793 resolved conflicts for merge of 81cd2e90 to master ...

Fixed public.xml value padding for kraken/master

Merge commit '81cd2e90' into manualmerge

Conflicts:
	api/current.xml

Change-Id: I09d2c5c7e6acbf4086c0bb8756a5aaf41a646d71

2010-04-23 16:49:54 -07:00

..

am

am 8aed789f: am 994e3990: am 2adec762: Merge "Fix issue #2621809: Kill! Kill! Kill!" into froyo

2010-04-23 14:36:21 -07:00

connectivity

Move Tethering off the ServerThread.

2010-04-20 15:51:20 -07:00

location

GpsLocationProvider: Eliminate MIN_FIX_COUNT.

2010-04-15 20:41:26 -04:00

status

Make the silent/vibrate status icon reflect overall device state. (DO NOT MERGE)

2010-04-19 14:36:57 -04: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

Preserve widgets on upgrade.

2010-03-11 18:06:42 -08:00

AttributeCache.java

…

BackupManagerService.java

am 7e93aad4: am 36fa4713: Merge "Fix security hole in Google backup transport registration" into froyo

2010-04-21 18:19:38 -07:00

BatteryService.java

Add thermal shutdown. If battery temp >= 68C.

2010-03-31 09:33:47 -07:00

BootReceiver.java

remove OTA packages from the old (pre-froyo) updater

2010-04-05 15:10:31 -07:00

BrickReceiver.java

Switch the services library to using the new Slog

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

ClipboardService.java

…

ConnectivityService.java

Run WifiWatchdogServiceThread only on wifi enable

2010-03-12 13:16:47 -08:00

DemoDataSet.java

Switch the services library to using the new Slog

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

DevicePolicyManagerService.java

Fix issue #2530103: ActivePassword data in Device Policy Manager needs to be persisted

2010-03-22 22:20:26 -07:00

DeviceStorageMonitorService.java

Switch the services library to using the new Slog

2010-03-01 13:06:50 -08: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

Limit DropBox storage to 1000 files (by default).

2010-03-24 17:48:20 -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

services: Introduce NativeDaemonConnector class

2010-01-12 13:55:39 -08:00

InputDevice.java

Fix epsilon calculation for jumpy touchscreen filtering

2010-03-03 20:43:16 -08:00

InputMethodManagerService.java

Fix build

2010-03-29 12:55:09 -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

KeyInputQueue.java

Fix issue #2512131: Trackball goes up when moving

2010-03-19 14:01:17 -07:00

LightsService.java

Switch the services library to using the new Slog

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

LoadAverageService.java

…

LocationManagerService.java

Move files internal to LocationManagerService from framework.jar to services.jar

2010-04-04 18:44:05 -04:00

MasterClearReceiver.java

DO NOT MERGE

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

MountService.java

Forcibly unmount the sdcard after N retries.

2010-04-06 10:02:34 -07:00

NativeDaemonConnector.java

Compact when NativeDaemonConnector hits buffer limit

2010-03-22 18:02:45 -07:00

NativeDaemonConnectorException.java

NativeDaemonConnector: Improve NativeDaemonException reporting to include the actual error response

2010-02-03 14:37:43 -08:00

NetStatService.java

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

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

NetworkManagementService.java

NetworkManagementService: Remove 'maxkbs' parameter from throttle API

2010-04-07 15:22:10 -07:00

NotificationManagerService.java

Remove logspew.

2010-03-30 15:45:31 -04:00

NotificationPlayer.java

Fix bug 2599698 Music paused by itself

2010-04-16 16:40:47 -07:00

PackageManagerBackupAgent.java

Workaround NPE caused by packages missing signatures.

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

PackageManagerService.java

Logo attribute for manifest and PackageManager methods to fetch it

2010-04-23 15:49:07 -07:00

PowerManagerService.java

Fix inconsistency in how we handle light sensor when battery is low.

2010-04-17 22:29:20 -04:00

ProcessMap.java

…

ProcessStats.java

Switch the services library to using the new Slog

2010-03-01 13:06:50 -08: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

SensorService.java

fix [2476230] sensor battery stats could get out of sync if an error occurs

2010-03-01 18:31:16 -08:00

ShutdownActivity.java

Switch the services library to using the new Slog

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

SystemBackupAgent.java

API CHANGE: rename BackupHelperAgent => BackupAgentHelper per API Council

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

SystemServer.java

Add service to monitor/control the flow of data.

2010-04-08 12:34:45 -07:00

TelephonyRegistry.java

Switch the services library to using the new Slog

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

ThrottleService.java

Respond to changes in throttle policy.

2010-04-23 13:15:44 -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

Fix issue #2581524: Car home icon should always go to car home

2010-04-09 16:49:08 -07:00

VibratorService.java

Switch the services library to using the new Slog

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

ViewServer.java

Switch the services library to using the new Slog

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

WallpaperManagerService.java

Maybe fix issue #2457218: Corrupt batterystats.bin file preventing phone boot - LIBtt68127

2010-03-19 13:59:07 -07:00

Watchdog.java

Dump the phone process stack (as well as the system process) on watchdog reset.

2010-03-11 22:27:59 -08:00

WifiService.java

Disable tethering when airplane mode is enabled

2010-04-06 10:35:27 -07:00

WifiWatchdogService.java

cherry-pick 288b4ac945 into froyo

2010-03-29 12:02:44 -07:00

WindowManagerService.java

am 2fe441fa: am 476a57e6: am 9bc0a572: Merge "Fix issue #2608292: Fails to launch the video camera preview" into froyo

2010-04-22 16:38:10 -07:00