Jeff Brown bce4561708 resolved conflicts for merge of 2d280f75 to ics-mr1 ...

Change-Id: I459e1cb0b60fb94dfb12862fedb9f8d949c226a7

2011-10-30 14:24:02 -07:00

..

storage

DO NOT MERGE - Require device encryption password for adb backup/restore

2011-10-13 17:39:48 -07:00

AsyncResult.java

…

AsyncTask.java

Revert "Check whether an AsyncTask is created/executed on a looper thread."

2011-10-11 18:13:37 -07:00

BadParcelableException.java

…

BatteryManager.java

…

BatteryStats.java

Work on issue #5465917: Wakelock *overflow* held for very long times

2011-10-18 16:38:17 -07:00

Binder.java

DO NOT MERGE. Integrate from master: Improve activity manager debug dumps.

2011-05-13 18:38:19 -07:00

Broadcaster.java

…

Build.java

Improve the slow query instrumentation.

2011-10-28 14:58:39 -07:00

Bundle.aidl

…

Bundle.java

Fix handling of "allow fds" state.

2011-10-03 21:09:35 -07:00

ConditionVariable.java

…

CountDownTimer.java

Fix typos

2011-10-20 15:32:37 -07:00

DeadObjectException.java

…

Debug.java

Improved memory use reporting.

2011-08-05 18:18:05 -07:00

DropBoxManager.aidl

…

DropBoxManager.java

…

Environment.java

Environment: Fix default mount point for external storage

2011-05-25 23:33:50 -04:00

FileObserver.java

…

FileUtils.java

resolved conflict for merge of fc51aaec to master

2011-06-04 07:31:35 -07:00

Handler.java

Fix for bug 5115066 Handler override of toString() hides derived class name

2011-08-09 16:27:06 +01:00

HandlerThread.java

Make some methods/fields package private so that layoutlib can access them.

2011-08-11 12:57:51 -07:00

IBinder.java

We must keep up with the Joneses.

2011-06-15 15:09:54 -07:00

IHardwareService.aidl

…

IInterface.java

…

IMessenger.aidl

…

INetworkManagementService.aidl

Fix IPv6 on wifi

2011-09-29 16:59:01 -07:00

IPermissionController.aidl

…

IPowerManager.aidl

Fix issue 4604090: notification sound interrupted.

2011-07-25 18:41:12 -07:00

IRemoteCallback.aidl

…

IServiceManager.java

…

IVibratorService.aidl

…

LatencyTimer.java

…

LocalPowerManager.java

…

Looper.java

Make some methods/fields package private so that layoutlib can access them.

2011-08-11 12:57:51 -07:00

MemoryFile.java

Fix MemoryFile's output stream to advance.

2011-03-24 18:18:19 -07:00

Message.aidl

…

Message.java

Always clear the Message when recycled.

2011-06-10 18:13:31 -07:00

MessageQueue.java

Remove the deprecated things from Config.java. These haven't been working since before 1.0.

2011-04-07 19:23:05 -07:00

Messenger.aidl

…

Messenger.java

…

NetworkOnMainThreadException.java

…

package.html

…

Parcel.java

Fix handling of "allow fds" state.

2011-10-03 21:09:35 -07:00

Parcelable.java

Add new Fragment API for explicitly saving/restoring state.

2011-06-02 19:18:07 -07:00

ParcelFileDescriptor.aidl

…

ParcelFileDescriptor.java

Add new am option to profile the launching of an activity.

2011-08-15 17:55:57 -07:00

ParcelFormatException.java

…

ParcelUuid.aidl

…

ParcelUuid.java

…

PatternMatcher.aidl

…

PatternMatcher.java

…

PerformanceCollector.java

…

Power.java

…

PowerManager.java

Fix race condition in WakeLocks.

2011-06-15 19:39:26 -07:00

Process.java

Merge "Add MEDIA_UID"

2011-07-14 10:59:40 -07:00

RecoverySystem.java

add rebootWipeCache call to RecoverySystem API

2011-07-19 12:45:09 -07:00

Registrant.java

…

RegistrantList.java

…

RemoteCallback.aidl

…

RemoteCallback.java

…

RemoteCallbackList.java

…

RemoteException.java

…

RemoteMailException.java

…

ResultReceiver.aidl

…

ResultReceiver.java

…

ServiceManager.java

Eliminate single-process mode.

2011-07-08 19:54:07 -07:00

ServiceManagerNative.java

…

StatFs.java

…

StrictMode.java

Don't log BlockGuard violations on ENG builds.

2011-10-11 11:35:23 -07:00

SystemClock.java

Convert looper traces to traceview traces

2011-07-20 18:47:17 -07:00

SystemProperties.java

…

SystemService.java

…

TokenWatcher.java

…

UEventObserver.java

…

Vibrator.java

…

WorkSource.aidl

…

WorkSource.java

…