frameworks_base

resolved conflicts for merge of b2d0ee16 to master

2011-05-19 15:02:18 -07:00

am fddd927f: am 9d0f2c6d: Merge "DO NOT MERGE: From master -- Fix bug in deciding which rotation to use for an orientation." into honeycomb-mr2

2011-05-16 13:04:49 -07:00

AbstractThreadedSyncAdapter.java

Move handing of a "cancel" inside try-finally block

2011-02-07 10:53:26 -08:00

ActivityNotFoundException.java

…

AsyncQueryHandler.java

Make AsyncQueryHandler emit more helpful log.

2010-11-18 10:54:00 -08:00

AsyncTaskLoader.java

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

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

BroadcastReceiver.java

Fix a bunch of API review bugs.

2011-01-17 16:23:42 -08:00

ClipboardManager.java

Fix a bunch of API review bugs.

2011-01-17 16:23:42 -08:00

ClipData.aidl

Improve clipboard API.

2010-08-27 11:06:01 -07:00

ClipData.java

Remove old APIs.

2011-01-17 17:16:02 -08:00

ClipDescription.aidl

Improve clipboard API.

2010-08-27 11:06:01 -07:00

ClipDescription.java

Fix some SDK build breakage. Not all.

2010-08-27 15:41:13 -07:00

ComponentCallbacks.java

…

ComponentName.aidl

…

ComponentName.java

…

ContentInsertHandler.java

…

ContentProvider.java

docs: fix links to revised fundamentals documents

2011-02-08 11:37:44 -08:00

ContentProviderClient.java

Add new ContentProvider for doing conversions to data streams.

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

ContentProviderNative.java

Add better SQL exception handling to the Sync framework (see bug #3202693 )

2010-12-02 14:28:32 -08:00

ContentProviderOperation.java

Fix the rest of the javadoc warnings.

2010-09-16 13:38:25 -04:00

ContentProviderResult.java

…

ContentQueryMap.java

handle a race condition where a cursor receives an inflight onChange after the cursor has been closed

2010-11-16 17:31:59 -08:00

ContentResolver.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

ContentService.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

ContentUris.java

…

ContentValues.java

Convert Numbers to Booleans when calling getAsBoolean().

2010-09-17 08:12:19 -05:00

Context.java

DO NOT MERGE: Backport USB accessory support to gingerbread

2011-03-01 23:09:12 -08:00

ContextWrapper.java

Add API to get path to OBBs.

2011-01-16 18:43:04 -08:00

CursorEntityIterator.java

…

CursorLoader.java

Fix a bunch of API review bugs.

2011-01-17 16:23:42 -08:00

DefaultDataHandler.java

…

DialogInterface.java

…

Entity.java

…

EntityIterator.java

…

EventLogTags.logtags

…

IClipboard.aidl

Implement permission granting in clipboard.

2010-10-05 14:09:08 -07:00

IContentProvider.java

Unhide Content{Resolver,Provider}.call()

2011-01-12 14:19:19 -08:00

IContentService.aidl

Add getCurrentSyncs() to the SDK, which replaces the deprecated

2010-10-08 09:50:45 -07:00

IIntentReceiver.aidl

…

IIntentSender.aidl

…

Intent.aidl

…

Intent.java

Fix javadoc.

2011-04-25 10:40:07 -07:00

IntentFilter.aidl

…

IntentFilter.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

IntentSender.aidl

…

IntentSender.java

…

IOnPrimaryClipChangedListener.aidl

First pass at a new clipboard API.

2010-08-05 12:28:20 -07:00

ISyncAdapter.aidl

…

ISyncContext.aidl

…

ISyncStatusObserver.aidl

…

Loader.java

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

2011-05-13 18:31:04 -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

…

ServiceConnection.java

…

SharedPreferences.java

am ca1db5ae: am dd644c17: Fallback to SharedPreferences.commit() when no apply() exists.

2010-10-11 17:43:06 -07:00

SyncActivityTooManyDeletes.java

fix the TooManyDeletes to show up again

2010-12-16 15:19:37 -08:00

SyncAdaptersCache.java

allow sync adapter authors to control more policies

2010-12-09 14:24:34 -08:00

SyncAdapterType.aidl

…

SyncAdapterType.java

revert an API change that conflicted witha previous SDK version

2010-12-09 16:26:18 -08:00

SyncContext.java

…

SyncInfo.aidl

…

SyncInfo.java

Add getCurrentSyncs() to the SDK, which replaces the deprecated

2010-10-08 09:50:45 -07:00

SyncManager.java

Rename method to discourage use of this in favor of member field

2011-02-16 10:29:56 -08:00

SyncOperation.java

allow sync adapter authors to control more policies

2010-12-09 14:24:34 -08:00

SyncQueue.java

Improved ignore-backoff handling

2010-12-22 14:40:43 -08:00

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

Fixes Issue 7907 in the public bugs database (http://code.google.com/p/android/issues/detail?id=7907 ).

2010-10-31 07:42:35 -07:00

XmlDocumentProvider.java

Fix a bunch of API review bugs.

2011-01-17 16:23:42 -08:00