kmccormick 24b8947f62 resolved conflicts for merge of 603f987f to jb-mr2-dev ...

Change-Id: I4a130dad9d4669799f5d477f67e0f9a6a04381ca

2013-03-27 19:23:51 -07:00

..

pm

resolved conflicts for merge of 603f987f to jb-mr2-dev

2013-03-27 19:23:51 -07:00

res

Avoid warnings about synthesized IDs.

2013-03-15 14:46:52 -07:00

AbstractThreadedSyncAdapter.java

Add System Tracing capability to Sync Manager

2012-05-04 11:24:33 -07:00

ActivityNotFoundException.java

…

AsyncQueryHandler.java

…

AsyncTaskLoader.java

Fix a bug where we could lose a loader content change.

2013-03-14 19:17:00 -07:00

BroadcastReceiver.java

docs: Fix a bunch of issues

2013-01-11 23:44:11 -08:00

ClipboardManager.java

App ops: adding operations for reading/writing clipboard.

2013-02-25 18:02:35 -08:00

ClipData.aidl

…

ClipData.java

ClipData: html attribute values should always be escaped

2012-07-27 13:27:00 -07:00

ClipDescription.aidl

…

ClipDescription.java

Add direct support for HTML formatted text in ClipData etc.

2012-04-13 15:36:06 -07:00

ComponentCallbacks2.java

Update process importance documentation.

2012-04-26 10:58:37 -07:00

ComponentCallbacks.java

…

ComponentName.aidl

…

ComponentName.java

…

ContentInsertHandler.java

…

ContentProvider.java

App ops: don't crash when provide read access is off.

2013-03-22 18:42:14 -07:00

ContentProviderClient.java

More work on App Ops service.

2013-01-16 12:11:01 -08:00

ContentProviderNative.java

More work on App Ops service.

2013-01-16 12:11:01 -08:00

ContentProviderOperation.java

…

ContentProviderResult.java

…

ContentQueryMap.java

…

ContentResolver.java

COnvert sync error to int

2013-02-07 12:01:10 -08:00

ContentUris.java

…

ContentValues.java

…

Context.java

Application restrictions API

2013-03-20 22:29:59 -07:00

ContextWrapper.java

Add explicit userId to AppWidget binder calls

2013-02-20 15:41:14 -08:00

CursorEntityIterator.java

…

CursorLoader.java

Remove a method

2013-03-14 10:47:10 -07:00

DefaultDataHandler.java

…

DialogInterface.java

…

Entity.java

…

EntityIterator.java

…

EventLogTags.logtags

…

IClipboard.aidl

App ops: adding operations for reading/writing clipboard.

2013-02-25 18:02:35 -08:00

IContentProvider.java

More work on App Ops service.

2013-01-16 12:11:01 -08:00

IContentService.aidl

Per-user content observer APIs

2012-09-17 16:35:36 -07:00

IIntentReceiver.aidl

am 768d9e1a: Merge "Correct executable bit for source files"

2012-11-07 11:52:12 -08:00

IIntentSender.aidl

…

Intent.aidl

…

Intent.java

Application restrictions API

2013-03-20 22:29:59 -07:00

IntentFilter.aidl

…

IntentFilter.java

Fix issue #8228463: contradicting public documentation on what...

2013-02-20 15:05:39 -08:00

IntentSender.aidl

…

IntentSender.java

Fix API review bugs.

2012-09-17 17:27:15 -07:00

IOnPrimaryClipChangedListener.aidl

…

ISyncAdapter.aidl

…

ISyncContext.aidl

…

ISyncStatusObserver.aidl

…

Loader.java

Fix a bug where we could lose a loader content change.

2013-03-14 19:17:00 -07:00

MutableContextWrapper.java

…

OperationApplicationException.java

…

package.html

…

PeriodicSync.aidl

…

PeriodicSync.java

Move lingering services to services.jar.

2012-12-11 09:50:50 -08:00

ReceiverCallNotAllowedException.java

…

RestrictionEntry.aidl

Application restrictions API

2013-03-20 22:29:59 -07:00

RestrictionEntry.java

Fix javadoc breakage

2013-03-20 23:54:07 -07:00

SearchRecentSuggestionsProvider.java

…

ServiceConnection.java

…

SharedPreferences.java

Document immutable requirement of SharedPreferences return objects

2012-10-19 13:43:52 -07:00

SyncActivityTooManyDeletes.java

…

SyncAdaptersCache.java

Move lingering services to services.jar.

2012-12-11 09:50:50 -08:00

SyncAdapterType.aidl

…

SyncAdapterType.java

…

SyncContext.java

…

SyncInfo.aidl

…

SyncInfo.java

Move lingering services to services.jar.

2012-12-11 09:50:50 -08:00

SyncResult.aidl

…

SyncResult.java

…

SyncStats.aidl

…

SyncStats.java

…

SyncStatusInfo.aidl

…

SyncStatusInfo.java

COnvert sync error to int

2013-02-07 12:01:10 -08:00

SyncStatusObserver.java

…

UriMatcher.java

Allow leading slash in path argument for addURI() method.

2013-03-26 11:20:47 -07:00