Dianne Hackborn 54a26bc85f resolved conflicts for merge of 889c2d37 to master

2009-07-10 16:05:59 -07:00

..

AsyncResult.java

auto import from //depot/cupcake/@135843

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

AsyncTask.java

Tweak the core and maximum pool sizes for AsyncTask.

2009-06-26 10:36:46 -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

auto import from //depot/cupcake/@135843

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

BatteryStats.java

Track activity foreground CPU usage for battery stats.

2009-06-03 15:38:24 -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

base: Rename WRITE_SDCARD -> WRITE_EXTERNAL_STORAGE

2009-06-01 09:25:28 -07: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

am 9c8dd55a: Fix bug 1829561 ("am profile" with bad filename kills process).

2009-06-24 16:25:26 -07:00

Environment.java

auto import from //depot/cupcake/@135843

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

FileObserver.java

auto import from //depot/cupcake/@135843

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

auto import from //depot/cupcake/@135843

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

HandlerThread.java

auto import from //depot/cupcake/@135843

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

Hardware.java

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

2009-03-18 17:39:46 -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

IHardwareService.aidl

Improve the Vibrator service by keeping track of multiple vibration requests.

2009-07-06 08:31:33 -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

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

auto import from //depot/cupcake/@135843

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

IServiceManager.java

auto import from //depot/cupcake/@135843

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

LatencyTimer.java

Added LatencyTimer to ease latency measurements

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

LocalPowerManager.java

AI 143800: am: CL 143748 Fix issue #1743326 (More battery stats)

2009-03-31 15:04:46 -07: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

auto import from //depot/cupcake/@135843

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

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

Power.java

Improve shutdown process to send broadcast for applications.

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

PowerManager.java

auto import from //depot/cupcake/@135843

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

Process.java

Fix bug #1873249i: Apps can DoS/brick device

2009-07-09 18:14:31 -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

RemoteCallbackList.java

merged 231cc608d0

2009-05-06 00:28:37 -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

auto import from //depot/cupcake/@135843

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

SystemProperties.java

auto import from //depot/cupcake/@135843

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

Improve the Vibrator service by keeping track of multiple vibration requests.

2009-07-06 08:31:33 -04:00