frameworks_base

resolved conflicts for merge of 3e4975a5 to master

2010-09-02 09:56:04 +08:00

am bbe5fb2b: am 189de282: Merge "Fix for a Resource system bug that displayed the wrong name for missing asset." into gingerbread

2010-08-21 09:44:34 -07:00

AbstractThreadedSyncAdapter.java

some changes due to an API review

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

ActivityNotFoundException.java

…

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

AsyncTaskLoader.java

Preventing cursor leaks when a query is interrupted

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

BroadcastReceiver.java

eclair snapshot

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

ClipboardManager.java

Improve clipboard API.

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

ClipData.aidl

Improve clipboard API.

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

ClipData.java

Fix some SDK build breakage. Not all.

2010-08-27 15:41:13 -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

Improve clipboard API.

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

ContentProviderClient.java

Add new ContentProvider for doing conversions to data streams.

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

ContentProviderNative.java

Add new ContentProvider for doing conversions to data streams.

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

ContentProviderOperation.java

Add error logging to ContentProviderOperation.

2010-02-19 15:30:44 -08:00

ContentProviderResult.java

eclair snapshot

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

ContentQueryMap.java

requery() return value should be checked

2010-08-04 12:54:48 -07:00

ContentResolver.java

Add new ContentProvider for doing conversions to data streams.

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

ContentService.java

merge from open-source master

2010-05-19 09:36:55 -07:00

ContentUris.java

…

ContentValues.java

Fix the documentation of ContentValues.

2010-08-25 10:19:36 -05:00

Context.java

resolved conflicts for merge of a06ad953 to master

2010-08-06 12:06:04 +08:00

ContextWrapper.java

new API in Context. on openDatabase, new param DatabaseErrorHandler

2010-06-03 12:38:11 -07:00

CursorEntityIterator.java

some changes due to an API review

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

CursorLoader.java

Removing closed cursor on stop

2010-08-09 18:01:31 -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

Improve clipboard API.

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

IContentProvider.java

Add new ContentProvider for doing conversions to data streams.

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

IContentService.aidl

some changes due to an API review

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

IIntentReceiver.aidl

eclair snapshot

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

IIntentSender.aidl

donut snapshot

2009-07-21 11:16:54 -07:00

Intent.aidl

…

Intent.java

Add an Intent category for apps that provide an app market.

2010-08-30 11:29:10 -07: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

donut snapshot

2009-07-21 11:16:54 -07:00

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 734d2707: am bb660d7e: Merge "Renaming SharedPreferences.startCommit to apply" into gingerbread

2010-08-30 18:25:02 -07:00

SyncAdaptersCache.java

Fix some bugs.

2010-03-04 11:52:14 -08:00

SyncAdapterType.aidl

eclair snapshot

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

SyncAdapterType.java

eclair snapshot

2009-11-13 13:53:39 -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

some changes due to an API review

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

SyncManager.java

am 2bf0f1a3: am 00b92b94: am 9aaf24f2: Merge "revert a change in the SyncManager that caused it to not cancel long running syncs if the next sync had the same account and authority." into froyo

2010-04-28 14:25:19 -07:00

SyncOperation.java

Changed SyncOperation.toKey() to not rely on the implementation of

2010-08-05 17:26:58 -07:00

SyncQueue.java

- changed periodic sync scheduling to just creating pending

2010-03-30 18:31:27 -07: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

am d66e2b23: am 4e7cacd3: Merge "Maybe fix issue #2568615 : System server crashed in SyncStorageEngine" into froyo

2010-04-07 11:58:21 -07:00

UriMatcher.java

…

XmlDocumentProvider.java

New XmlDocumentProvider class.

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