Mike Lockwood 726a570258 resolved conflicts for merge of dfaf2e03 to master ...

Change-Id: I440d2042dd404a421789063e42102699fa33b7c0

2009-11-25 15:05:51 -05:00

..

AsyncResult.java

auto import from //depot/cupcake/@135843

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

AsyncTask.java

Make sure AsyncTask sens a null result to onPostExecute() when cancelled.

2009-10-05 14:48:04 -07:00

BadParcelableException.java

auto import from //depot/cupcake/@135843

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

Base64Utils.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

Proper fix for zero signal strength and no_service. Fixes #2176141

2009-10-19 15:16:26 -07:00

Binder.java

auto import from //depot/cupcake/@135843

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

Broadcaster.java

auto import from //depot/cupcake/@135843

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

Build.java

Fix most of issue #2271640: Fix wallpaper etc docs

2009-11-18 18:34:19 -08:00

Bundle.aidl

auto import from //depot/cupcake/@135843

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

Bundle.java

Fix a major bug in Bundle when unparcelling from AIDL.

2009-05-22 13:51:47 -07: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 a reference table dump call.

2009-10-22 17:25:57 -07:00

DropBoxManager.aidl

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

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

DropBoxManager.java

Fix the SDK build.

2009-11-14 16:32:13 -08:00

Environment.java

Encrypted File Systems Project. Installer modifications.

2009-11-24 11:44:19 -08:00

FileObserver.java

Only restore the bits for wallpapers that aren't built in.

2009-07-29 12:05:36 -07:00

FileUtils.java

auto import from //depot/cupcake/@135843

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

Handler.java

auto import from //depot/cupcake/@135843

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

HandlerState.java

auto import from //depot/cupcake/@135843

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

HandlerStateMachine.java

I am getting tired of the java doc warnings, so fix them.

2009-08-24 17:37:32 -07:00

HandlerThread.java

Some optizations to wallpaper drawing/scrolling.

2009-09-14 15:29:44 -07:00

IBinder.java

auto import from //depot/cupcake/@135843

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

ICheckinService.aidl

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08: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

IMountService.aidl

auto import from //branches/cupcake_rel/...@138607

2009-03-13 13:04:22 -07:00

INetStatService.aidl

auto import from //depot/cupcake/@135843

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

IParentalControlCallback.aidl

auto import from //depot/cupcake/@135843

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

IPermissionController.aidl

auto import from //depot/cupcake/@135843

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

IPowerManager.aidl

IPowerManager: remove some unused methods.

2009-11-20 11:50:21 -05: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

MailboxNotAvailableException.java

auto import from //depot/cupcake/@135843

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

MemoryFile.java

MemoryFile.isMemoryFile was internally determining the length of

2009-06-17 13:00:07 -07:00

Message.aidl

auto import from //depot/cupcake/@135843

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

Message.java

auto import from //depot/cupcake/@135843

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

MessageQueue.java

auto import from //depot/cupcake/@135843

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

Messenger.aidl

auto import from //depot/cupcake/@135843

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

Messenger.java

auto import from //depot/cupcake/@135843

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

NetStat.java

auto import from //depot/cupcake/@135843

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

package.html

auto import from //depot/cupcake/@135843

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

Parcel.java

Fix a major bug in Bundle when unparcelling from AIDL.

2009-05-22 13:51:47 -07: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

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08: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

Improve shutdown process to send broadcast for applications.

2009-05-08 12:59:21 -07:00

PowerManager.java

fix bad link in javadoc that's breaking SDK build

2009-11-19 18:17:15 -08:00

Process.java

Add support for running apps with uid/gid AID_LOG by specifying android.uid.log in the manifest

2009-09-03 13:47:54 -04: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

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

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