Brad Fitzpatrick 7f7ce40f90 resolved conflicts for merge of 28130bae to master ...

Change-Id: I13df8dc12092c3d2536e12216df9130d5914380a

2010-08-27 16:11:27 -07:00

..

storage

resolved conflicts for merge of 485de781 to master

2010-08-24 09:57:33 -07:00

AsyncResult.java

…

AsyncTask.java

Add new ContentProvider for doing conversions to data streams.

2010-08-08 18:49:31 -07:00

BadParcelableException.java

…

BatteryManager.java

…

BatteryStats.java

Fix a few small battery stats problems:

2010-08-20 13:43:00 -07:00

Binder.java

…

Broadcaster.java

…

Build.java

Make Theme.Holo the default theme for new apps.

2010-08-23 18:51:26 -07:00

Bundle.aidl

…

Bundle.java

…

ConditionVariable.java

…

CountDownTimer.java

…

DeadObjectException.java

…

Debug.java

…

DropBoxManager.aidl

…

DropBoxManager.java

…

Environment.java

…

FileObserver.java

…

FileUtils.java

…

Handler.java

SharedPreferences$Editor.startCommit()

2010-08-27 09:10:11 -07:00

HandlerThread.java

…

IBinder.java

…

IHardwareService.aidl

…

IInterface.java

…

IMessenger.aidl

…

INetStatService.aidl

…

INetworkManagementService.aidl

…

IPermissionController.aidl

…

IPowerManager.aidl

…

IRemoteCallback.aidl

…

IServiceManager.java

…

IVibratorService.aidl

…

LatencyTimer.java

…

LocalPowerManager.java

…

Looper.java

Fix problems with determining when to kill apps for wake usage.

2010-08-15 17:27:29 -07:00

MemoryFile.java

New API and implementation of DB and memory-backed FDs

2010-08-18 15:39:52 +01:00

Message.aidl

…

Message.java

Allow reliable detection of a message that is in use.

2010-08-24 10:56:30 -07:00

MessageQueue.java

Allow reliable detection of a message that is in use.

2010-08-24 10:56:30 -07:00

Messenger.aidl

…

Messenger.java

…

package.html

…

Parcel.java

…

Parcelable.java

…

ParcelFileDescriptor.aidl

…

ParcelFileDescriptor.java

New API and implementation of DB and memory-backed FDs

2010-08-18 15:39:52 +01:00

ParcelFormatException.java

…

ParcelUuid.aidl

…

ParcelUuid.java

…

PatternMatcher.aidl

…

PatternMatcher.java

…

PerformanceCollector.java

…

Power.java

…

PowerManager.java

…

Process.java

…

RecoverySystem.java

…

Registrant.java

…

RegistrantList.java

…

RemoteCallback.aidl

…

RemoteCallback.java

…

RemoteCallbackList.java

…

RemoteException.java

…

RemoteMailException.java

…

ResultReceiver.aidl

…

ResultReceiver.java

…

ServiceManager.java

…

ServiceManagerNative.java

…

StatFs.java

…

StrictMode.java

Some StrictMode API changes.

2010-08-24 11:47:19 -07:00

SystemClock.java

…

SystemProperties.java

…

SystemService.java

…

TokenWatcher.java

…

UEventObserver.java

…

Vibrator.java

…