Nick Pelly d250746716 resolved conflicts for merge of 1d0d1188 to master ...

Change-Id: I80413d5a54a0284ab6f685c4c6197a2c009ea717

2010-12-13 12:22:34 -08:00

..

pm

add caching to the AccountManagerService

2010-12-03 15:35:48 -08:00

res

Only decrement mRemaining once in read().

2010-12-02 11:36:47 +00:00

AbstractThreadedSyncAdapter.java

allow sync adapter authors to control more policies

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

ActivityNotFoundException.java

…

AsyncQueryHandler.java

Make AsyncQueryHandler emit more helpful log.

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

AsyncTaskLoader.java

Preventing cursor leaks when a query is interrupted

2010-06-16 15:38:07 -07:00

BroadcastReceiver.java

Add facility for broadcasts receives to do work asynchronously.

2010-10-27 17:13:29 -07:00

ClipboardManager.java

Fix ClipboardManager#hasText

2010-11-19 15:31:04 -08:00

ClipData.aidl

Improve clipboard API.

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

ClipData.java

ClipDescription no longer inherits from ClipData.

2010-10-26 15:23:15 -07: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

Fix issue #2438980: Implement package watcher for voice recognizer service setting

2010-02-22 11:27:52 -08:00

ContentInsertHandler.java

…

ContentProvider.java

Allow all apps to call ContentResolver.getType().

2010-09-27 18:05:44 -07: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

eclair snapshot

2009-11-13 13:53:39 -08:00

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

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

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

ContentService.java

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

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

ContentUris.java

…

ContentValues.java

Convert Numbers to Booleans when calling getAsBoolean().

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

Context.java

resolved conflicts for merge of 1d0d1188 to master

2010-12-13 12:22:34 -08:00

ContextWrapper.java

Implement issue #3221502: New APIs to support new back stack / task navigation

2010-11-22 18:35:55 -08:00

CursorEntityIterator.java

some changes due to an API review

2010-03-30 17:31:52 -07:00

CursorLoader.java

Making observer registration customizable.

2010-09-22 12:51:01 -07:00

DefaultDataHandler.java

…

DialogInterface.java

Add Dialog.setOnShowListener() to the public API.

2010-01-15 11:35:06 -08:00

Entity.java

am 328c0e79: - removed the concept of Entity from the ContentProvider APIs - removed the parcelling ability from Entity and EntityIterator and made them public - added an EntityIterator abstract implementation that allow easy wrapping of a Cursor - changed the VCard c

2009-12-10 10:37:52 -08:00

EntityIterator.java

some changes due to an API review

2010-03-30 17:31:52 -07:00

EventLogTags.logtags

Rename logtag for clarity.

2010-04-08 13:25:46 -07:00

IClipboard.aidl

Implement permission granting in clipboard.

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

IContentProvider.java

Add new ContentProvider for doing conversions to data streams.

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

IContentService.aidl

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

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

IIntentReceiver.aidl

eclair snapshot

2009-11-13 13:53:39 -08:00

IIntentSender.aidl

…

Intent.aidl

…

Intent.java

Implement issue #3221502: New APIs to support new back stack / task navigation

2010-11-22 18:35:55 -08:00

IntentFilter.aidl

…

IntentFilter.java

Re-arrange android-common so framework no longer links with it.

2010-02-25 11:39:33 -08:00

IntentSender.aidl

…

IntentSender.java

Add support for heavy-weight applications.

2010-06-04 10:09:13 -07:00

IOnPrimaryClipChangedListener.aidl

First pass at a new clipboard API.

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

ISyncAdapter.aidl

eclair snapshot

2009-11-13 13:53:39 -08:00

ISyncContext.aidl

…

ISyncStatusObserver.aidl

…

Loader.java

Adding a method called when detecting content change.

2010-08-03 09:30:47 -07:00

MutableContextWrapper.java

…

OperationApplicationException.java

eclair snapshot

2009-11-13 13:53:39 -08:00

package.html

Deprecate fill_parent and introduce match_parent.

2010-01-08 15:11:38 -08:00

PeriodicSync.aidl

add sync polling

2010-02-05 15:16:20 -08:00

PeriodicSync.java

add sync polling

2010-02-05 15:16:20 -08:00

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

SyncAdaptersCache.java

allow sync adapter authors to control more policies

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

SyncAdapterType.aidl

eclair snapshot

2009-11-13 13:53:39 -08:00

SyncAdapterType.java

revert an API change that conflicted witha previous SDK version

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

SyncContext.java

eclair snapshot

2009-11-13 13:53:39 -08:00

SyncInfo.aidl

some changes due to an API review

2010-03-30 17:31:52 -07:00

SyncInfo.java

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

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

SyncManager.java

allow sync adapter authors to control more policies

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

SyncOperation.java

allow sync adapter authors to control more policies

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

SyncQueue.java

allow sync adapter authors to control more policies

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

SyncResult.aidl

…

SyncResult.java

Add JavaDoc for SyncResult

2010-04-27 11:21:53 -07:00

SyncStats.aidl

…

SyncStats.java

Add JavaDoc for SyncResult

2010-04-27 11:21:53 -07:00

SyncStatusInfo.aidl

…

SyncStatusInfo.java

add sync polling

2010-02-05 15:16:20 -08:00

SyncStatusObserver.java

eclair snapshot

2009-11-13 13:53:39 -08:00

SyncStorageEngine.java

make sure that pending operation reconstituted from disk

2010-12-06 15:09:32 -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

New XmlDocumentProvider class.

2010-06-23 10:43:00 -07:00