Fred Quintana 2c5634198a resolved conflicts for merge of 5a374f94 to master

2009-12-15 15:57:33 -08:00

..

pm

am e2585127: am 9ed7dc10: am 5886050f: Merge change I0d8f7593 into eclair

2009-12-02 20:24:44 -08:00

res

Fix #2262593: 42 ANR reports from android.process.acore

2009-11-16 17:16:26 -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

…

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

…

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

Avoid NPE when callers send null selection args.

2009-10-29 17:38:27 -07:00

ContentProviderResult.java

…

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

…

ContentUris.java

…

ContentValues.java

…

Context.java

Add bindService API to not bring ot foreground.

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

ContextWrapper.java

…

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

…

IIntentReceiver.aidl

…

IIntentSender.aidl

…

Intent.aidl

…

Intent.java

Implement API to have new broadcasts replace existing broadcasts.

2009-12-14 15:03:35 -08:00

IntentFilter.aidl

…

IntentFilter.java

…

IntentSender.aidl

…

IntentSender.java

…

ISyncAdapter.aidl

add an IPC for sync initialization

2009-10-14 16:06:39 -07:00

ISyncContext.aidl

…

ISyncStatusObserver.aidl

…

MutableContextWrapper.java

…

OperationApplicationException.java

…

package.html

…

ReceiverCallNotAllowedException.java

…

SearchRecentSuggestionsProvider.java

…

ServiceConnection.java

…

SharedPreferences.java

…

SyncAdaptersCache.java

Make the RegisteredSErvices Cache not allow the registered service for a

2009-11-10 16:10:54 -08:00

SyncAdapterType.aidl

…

SyncAdapterType.java

…

SyncContext.java

add an IPC for sync initialization

2009-10-14 16:06:39 -07:00

SyncManager.java

Add bindService API to not bring ot foreground.

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

SyncResult.aidl

…

SyncResult.java

changes from Sync Manager API Review: bug 2164262

2009-10-06 22:30:48 -07:00

SyncStats.aidl

…

SyncStats.java

…

SyncStatusInfo.aidl

…

SyncStatusInfo.java

…

SyncStatusObserver.java

…

SyncStorageEngine.java

Encrypted File Systems Project. Installer modifications.

2009-11-24 11:44:19 -08:00

UriMatcher.java

…