Jason Simmons 3b282fae37 resolved conflicts for merge of 0c0120ef to ics-aah ...

Change-Id: If1f39ff160b4305ef057d50bb1f01d2c45f1579d

2011-12-06 11:11:13 -08:00

..

pm

Update GET_UNINSTALLED_PACKAGES flag documentation

2011-11-03 10:13:29 -07:00

res

XML parsing optimizations

2011-11-11 16:10:42 -08:00

AbstractThreadedSyncAdapter.java

add a way for the sync adapter to specify the activity that should

2011-08-25 17:23:42 -07:00

ActivityNotFoundException.java

…

AsyncQueryHandler.java

…

AsyncTaskLoader.java

DO NOT MERGE: Integrate from main - Deprecate a bunch of APIs.

2011-05-13 18:31:04 -07:00

BroadcastReceiver.java

Merge "docs: add developer guide cross-references, Project ACRE"

2011-10-04 14:03:12 -07:00

ClipboardManager.java

…

ClipData.aidl

…

ClipData.java

…

ClipDescription.aidl

…

ClipDescription.java

…

ComponentCallbacks2.java

Various work on out of memory managment.

2011-07-29 02:06:46 -07:00

ComponentCallbacks.java

Various work on out of memory managment.

2011-07-29 02:06:46 -07:00

ComponentName.aidl

…

ComponentName.java

…

ContentInsertHandler.java

…

ContentProvider.java

docs: add developer guide cross-references, Project ACRE, Round 2

2011-10-14 10:18:33 -07:00

ContentProviderClient.java

…

ContentProviderNative.java

Use ashmem for CursorWindows.

2011-10-11 11:03:19 -07:00

ContentProviderOperation.java

…

ContentProviderResult.java

…

ContentQueryMap.java

…

ContentResolver.java

Merge "Add a CrossProcessCursorWrapper. Bug: 5220669"

2011-10-14 21:06:22 -07:00

ContentService.java

Work on death recipient leaks in Activity Manager and Content Service.

2011-07-17 17:50:37 -07:00

ContentUris.java

…

ContentValues.java

…

Context.java

am f136aa34: Merge "Various performance and other work." into ics-mr1

2011-11-01 17:44:04 +00:00

ContextWrapper.java

…

CursorEntityIterator.java

…

CursorLoader.java

Calling close() outside of the main thread breaks stuff.

2011-10-09 16:01:40 -07:00

DefaultDataHandler.java

…

DialogInterface.java

…

Entity.java

…

EntityIterator.java

…

EventLogTags.logtags

…

IClipboard.aidl

…

IContentProvider.java

Fix ownership of CursorWindows across processes.

2011-10-09 22:10:36 -07:00

IContentService.aidl

…

IIntentReceiver.aidl

…

IIntentSender.aidl

Fix issue #4902856: Don't let apps register non-explicit PendingIntents

2011-06-30 11:23:54 -07:00

Intent.aidl

…

Intent.java

Fix issue #5714517: App shortcuts can result in bad task intents

2011-12-05 17:42:41 -08:00

IntentFilter.aidl

…

IntentFilter.java

docs: add developer guide cross-references, Project ACRE

2011-10-04 13:57:00 -07:00

IntentSender.aidl

…

IntentSender.java

Fix issue #4902856: Don't let apps register non-explicit PendingIntents

2011-06-30 11:23:54 -07:00

IOnPrimaryClipChangedListener.aidl

Fix intermediate src dir for framework.jar

2011-05-18 09:48:40 -07:00

ISyncAdapter.aidl

…

ISyncContext.aidl

…

ISyncStatusObserver.aidl

…

Loader.java

Various performance and other work.

2011-10-31 16:52:34 -07:00

MutableContextWrapper.java

…

OperationApplicationException.java

…

package.html

Update package descriptions with editorial revisions.

2011-01-26 14:58:19 -08:00

PeriodicSync.aidl

…

PeriodicSync.java

…

ReceiverCallNotAllowedException.java

…

SearchRecentSuggestionsProvider.java

SearchView behavioral and visual changes

2011-07-18 17:32:24 -07:00

ServiceConnection.java

…

SharedPreferences.java

docs: add developer guide cross references, Project ACRE, round 3

2011-10-28 14:23:23 -07:00

SyncActivityTooManyDeletes.java

…

SyncAdaptersCache.java

add a way for the sync adapter to specify the activity that should

2011-08-25 17:23:42 -07:00

SyncAdapterType.aidl

…

SyncAdapterType.java

add a way for the sync adapter to specify the activity that should

2011-08-25 17:23:42 -07:00

SyncContext.java

…

SyncInfo.aidl

…

SyncInfo.java

…

SyncManager.java

By default ICS allows two syncs to run in parallel. Make it only

2011-12-05 15:44:34 -08:00

SyncOperation.java

…

SyncQueue.java

…

SyncResult.aidl

…

SyncResult.java

…

SyncStats.aidl

…

SyncStats.java

…

SyncStatusInfo.aidl

…

SyncStatusInfo.java

…

SyncStatusObserver.java

…

SyncStorageEngine.java

Bring back auto clear backoff on reconnect

2011-02-16 10:17:49 -08:00

UriMatcher.java

…