frameworks_base

pm

resolved conflicts for merge of ad2fa35d to master

2009-12-22 10:11:55 -08:00

res

Update imports to android-common

2009-12-21 13:59:18 -08:00

AbstractThreadedSyncAdapter.java

moved the hidden sync helpers out of the framework

2009-12-14 16:33:13 -08:00

ActiveSyncInfo.aidl

…

ActiveSyncInfo.java

eclair snapshot

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

BroadcastReceiver.java

eclair snapshot

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

ComponentCallbacks.java

…

ComponentName.aidl

…

ComponentName.java

…

ContentInsertHandler.java

…

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

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

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

ContentProviderOperation.java

eclair snapshot

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

ContentProviderResult.java

eclair snapshot

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

ContentQueryMap.java

…

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

ContentService.java

eclair snapshot

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

ContentUris.java

…

ContentValues.java

…

Context.java

Fix DropBox reference in SDK comment. (Fix SDK build.)

2010-01-04 11:02:00 -08:00

ContextWrapper.java

eclair snapshot

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

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

DefaultDataHandler.java

…

DialogInterface.java

…

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

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

EventLogTags.logtags

move event log tags used by SyncAdapter into a local .logtags file

2009-12-09 13:30:07 -08:00

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

IContentService.aidl

eclair snapshot

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

IIntentReceiver.aidl

eclair snapshot

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

IIntentSender.aidl

…

Intent.aidl

…

Intent.java

resolved conflicts for merge of ad2fa35d to master

2009-12-22 10:11:55 -08:00

IntentFilter.aidl

…

IntentFilter.java

Update imports to android-common

2009-12-21 13:59:18 -08:00

IntentSender.aidl

…

IntentSender.java

eclair snapshot

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

ISyncAdapter.aidl

eclair snapshot

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

ISyncContext.aidl

…

ISyncStatusObserver.aidl

…

MutableContextWrapper.java

…

OperationApplicationException.java

eclair snapshot

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

package.html

…

ReceiverCallNotAllowedException.java

…

SearchRecentSuggestionsProvider.java

…

ServiceConnection.java

…

SharedPreferences.java

…

SyncAdaptersCache.java

eclair snapshot

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

SyncManager.java

Add bindService API to not bring ot foreground.

2009-12-08 16:33:59 -08:00

SyncResult.aidl

…

SyncResult.java

eclair snapshot

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

SyncStats.aidl

…

SyncStats.java

eclair snapshot

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

SyncStatusInfo.aidl

…

SyncStatusInfo.java

eclair snapshot

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

SyncStatusObserver.java

eclair snapshot

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

SyncStorageEngine.java

resolved conflicts for merge of ad2fa35d to master

2009-12-22 10:11:55 -08:00

UriMatcher.java

…