Jeff Brown 8e03b7566c resolved conflicts for merge of 9e660c82 to master ...

Change-Id: Ic4bd85cbaa5b9a10dcb474a0dad46490bf967e43

2010-06-13 19:16:55 -07:00

..

storage

framework: Hide StorageManager for froyo - do not merge

2010-03-31 10:46:42 -07:00

AsyncResult.java

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

AsyncTask.java

Do not invoke onProgressUpdate if the task is canceled.

2010-06-03 10:56:41 -07:00

BadParcelableException.java

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

BatteryManager.java

Add better APIs for the battery status, and other cleanup.

2009-09-19 14:03:05 -07:00

BatteryStats.java

Adjust activity manager process OOM adj.

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

Binder.java

Clarify some Binder docs regarding things that are thread-local.

2010-03-25 20:40:34 -07:00

Broadcaster.java

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

Build.java

New xlarge screen size.

2010-04-28 16:51:52 -07:00

Bundle.aidl

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

Bundle.java

Add "call" method on ContentProvider.

2010-03-05 12:08:39 -08:00

ConditionVariable.java

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

CountDownTimer.java

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

DeadObjectException.java

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

Debug.java

Add Debug.dumpService(), a public method for "dumpsys" functionality

2010-03-08 12:13:11 -08:00

DropBoxManager.aidl

Rename [I]DropBox[Service] to [I]DropBoxManager[Service].

2009-11-12 13:58:27 -08:00

DropBoxManager.java

Change the DropBoxManager API slightly (this is public, but not yet released) --

2009-11-25 12:38:00 -08:00

Environment.java

am 822a7e2d: am ce59fb8b: Fix issue #2578244: playing audio file downloaded by the browser...

2010-04-07 19:13:22 -07:00

FileObserver.java

Comment-only change to add documentation for FileObserver

2010-05-31 12:17:12 -07:00

FileUtils.java

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

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

Handler.java

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

HandlerThread.java

Do setThreadPriority() later so we can notify the waiting thread

2010-02-16 15:34:06 -08:00

IBinder.java

doc change: In fundamentals doc, make statement about synchronous execution of RPC less strict. Indicate that FLAG_ONEWAY applies only across processes.

2010-03-29 14:47:39 -07:00

IHardwareService.aidl

Resurrect flashlight support in obsolete IHardwareService Binder API.

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

IInterface.java

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

IMessenger.aidl

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

INetStatService.aidl

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

INetworkManagementService.aidl

NetworkManagementService: Remove 'maxkbs' parameter from throttle API

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

IPermissionController.aidl

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

IPowerManager.aidl

More device admin.

2010-01-28 13:15:57 -08:00

IRemoteCallback.aidl

More work on device admins:

2010-01-27 13:51:53 -08:00

IServiceManager.java

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

IVibratorService.aidl

Remove HardwareService and move vibrator support to VibratorService.

2009-11-25 12:54:58 -05:00

LatencyTimer.java

Added LatencyTimer to ease latency measurements

2009-05-15 18:18:28 -07:00

LocalPowerManager.java

Add window manager support for overriding button and keyboard backlight values.

2009-11-23 15:16:55 -05:00

Looper.java

AI 145994: Integrate #145778 from Donut.

2009-04-13 16:11:55 -07:00

MemoryFile.java

Maybe fix #2422586: Native crash in android_os_Parcel_closeFileDescriptor()

2010-03-23 22:10:55 -07:00

Message.aidl

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

Message.java

Improve Service documentation with some samples.

2010-02-18 16:28:23 -08:00

MessageQueue.java

Native input dispatch rewrite work in progress.

2010-06-13 17:42:16 -07:00

Messenger.aidl

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

Messenger.java

More work on device admins:

2010-01-27 13:51:53 -08:00

package.html

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

Parcel.java

Support CharSequence lists+arrays in Bundle+Intent

2010-02-26 11:16:17 -08:00

Parcelable.java

Fix code example in Parcelable javadoc

2009-10-28 19:16:24 +00:00

ParcelFileDescriptor.aidl

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

ParcelFileDescriptor.java

Sketch of Native input for MessageQueue / Looper / ViewRoot

2010-05-06 17:00:54 -07:00

ParcelFormatException.java

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

ParcelUuid.aidl

Move android.bluetooth.ParcelUuid to android.os.ParcelUuid

2009-09-28 13:06:22 -07:00

ParcelUuid.java

Move android.bluetooth.ParcelUuid to android.os.ParcelUuid

2009-09-28 13:06:22 -07:00

PatternMatcher.aidl

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

PatternMatcher.java

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

PerformanceCollector.java

PerformanceCollector: Collect & report perf measurements in key/value form

2009-10-28 14:32:05 -07:00

Power.java

Add new shutdown observer for MountService.

2010-03-09 17:00:18 -05:00

PowerManager.java

Improve wakelock debugging:

2010-03-22 17:10:15 -04:00

Process.java

Hopefully fix issue #2662536: Why is launcher being killed?

2010-05-10 17:19:58 -07:00

RecoverySystem.java

am 6c099149: am 37d2f5d1: Merge "Remove @link to hidden ACCESS_CACHE_FILESYSTEM permission." into froyo

2010-04-08 22:50:42 -07:00

Registrant.java

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

RegistrantList.java

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

RemoteCallback.aidl

More work on device admins:

2010-01-27 13:51:53 -08:00

RemoteCallback.java

More work on device admins:

2010-01-27 13:51:53 -08:00

RemoteCallbackList.java

resolved conflicts for merge of b06ea706 to master

2009-07-14 12:51:00 -07:00

RemoteException.java

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

RemoteMailException.java

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

ResultReceiver.aidl

auto import from //depot/cupcake/@136594

2009-03-05 14:34:35 -08:00

ResultReceiver.java

auto import from //depot/cupcake/@136594

2009-03-05 14:34:35 -08:00

ServiceManager.java

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

ServiceManagerNative.java

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

StatFs.java

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

StrictMode.java

More StrictMode work, handling violations in ActivityManagerService.

2010-06-11 16:11:26 -07:00

SystemClock.java

Update docs.

2009-07-31 17:58:55 -07:00

SystemProperties.java

SystemProperties: eliminate unnecessary string allocation.

2009-08-12 17:20:41 -04:00

SystemService.java

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

TokenWatcher.java

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

UEventObserver.java

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

Vibrator.java

Remove HardwareService and move vibrator support to VibratorService.

2009-11-25 12:54:58 -05:00