Fred Quintana 735f455386 resolved conflicts for merge of ae0cf6dc to eclair-mr2

2009-11-11 16:18:46 -08:00

..

pm

Make the RegisteredSErvices Cache not allow the registered service for a

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

res

Fix issue #2226370: Resource versions match with equality

2009-11-01 21:16:59 -08:00

AbstractCursorEntityIterator.java

- hide Entity and all its references

2009-10-06 11:51:19 -07:00

AbstractSyncableContentProvider.java

resolved conflicts for merge of ae0cf6dc to eclair-mr2

2009-11-11 16:18:46 -08:00

AbstractTableMerger.java

do not merge: cherrypicked 3710f39096 from master branch

2009-08-15 22:40:25 -07:00

AbstractThreadedSyncAdapter.java

add an IPC for sync initialization

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

ActiveSyncInfo.aidl

Rewrite SyncStorageEngine to use flat files and in-memory data structures.

2009-05-05 15:40:53 -07:00

ActiveSyncInfo.java

merged 231cc608d0

2009-05-06 00:28:37 -07:00

ActivityNotFoundException.java

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

AsyncQueryHandler.java

fix build breakage

2009-10-06 13:21:23 -07:00

BroadcastReceiver.java

Fix issue #2166755: BroadcastReceiver trying to return result during a non-ordered broadcast

2009-10-05 15:52:32 -07:00

ComponentCallbacks.java

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

ComponentName.aidl

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

ComponentName.java

Make android.content.ComponentName implement java.lang.Comparable.

2009-05-12 23:40:45 -04:00

ContentInsertHandler.java

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

ContentProvider.java

- hide Entity and all its references

2009-10-06 11:51:19 -07:00

ContentProviderClient.java

- hide Entity and all its references

2009-10-06 11:51:19 -07:00

ContentProviderNative.java

- hide Entity and all its references

2009-10-06 11:51:19 -07:00

ContentProviderOperation.java

Avoid NPE when callers send null selection args.

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

ContentProviderResult.java

- create a new generic ISyncAdapter implementation, SyncAdapterNew

2009-06-01 16:17:03 -07:00

ContentQueryMap.java

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

ContentResolver.java

- hide Entity and all its references

2009-10-06 11:51:19 -07:00

ContentService.java

Sync status was ignoring account - the new UI has specific sync status for each account, so we need to use it.

2009-09-08 14:05:43 -07:00

ContentUris.java

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

ContentValues.java

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

Context.java

Instead of a raw AIDL interface, give DropBox a Java

2009-10-28 15:49:11 -07:00

ContextWrapper.java

Add API to send an ordered sticky broadcast.

2009-09-19 12:05:25 -07:00

DefaultDataHandler.java

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

DialogInterface.java

Fixes lock on Home. Adds a new API on Dialog to get a callback when the dialog

2009-07-14 14:50:31 -07:00

Entity.aidl

content provider entities

2009-05-13 12:49:04 -07:00

Entity.java

- hide Entity and all its references

2009-10-06 11:51:19 -07:00

EntityIterator.java

- hide Entity and all its references

2009-10-06 11:51:19 -07:00

IContentProvider.java

- hide Entity and all its references

2009-10-06 11:51:19 -07:00

IContentService.aidl

- add a "isSyncable" flag to a given account/authority pair that

2009-08-17 13:02:42 -07:00

IEntityIterator.java

- add a reset to EntityIterator to allow it to go back to the beginning

2009-08-20 17:18:58 -07:00

IIntentReceiver.aidl

Fix issue #2166755: BroadcastReceiver trying to return result during a non-ordered broadcast

2009-10-05 15:52:32 -07:00

IIntentSender.aidl

Remove circular dependency in PackageManager. api freeStorage uses PendingIntent from android.app

2009-06-17 11:31:26 -07:00

Intent.aidl

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

Intent.java

add class description and revise descriptions for

2009-09-30 13:14:55 -07:00

IntentFilter.aidl

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

IntentFilter.java

Fix IntentFilter constructor to properly process the action parameter.

2009-06-11 18:50:40 -07:00

IntentSender.aidl

Remove circular dependency in PackageManager. api freeStorage uses PendingIntent from android.app

2009-06-17 11:31:26 -07:00

IntentSender.java

Fix issue #2166755: BroadcastReceiver trying to return result during a non-ordered broadcast

2009-10-05 15:52:32 -07:00

ISyncAdapter.aidl

add an IPC for sync initialization

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

ISyncContext.aidl

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

ISyncStatusObserver.aidl

Rewrite SyncStorageEngine to use flat files and in-memory data structures.

2009-05-05 15:40:53 -07:00

MutableContextWrapper.java

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

OperationApplicationException.java

add the ability to specify yieldpoints in a ContentProviderOperation

2009-08-28 17:01:16 -07:00

package.html

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

ReceiverCallNotAllowedException.java

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

SearchRecentSuggestionsProvider.java

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

ServiceConnection.java

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

SharedPreferences.java

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

SyncableContentProvider.java

decouple SyncAdapter from ContentProvider

2009-04-30 17:28:09 -07:00

SyncAdapter.java

add an IPC for sync initialization

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

SyncAdaptersCache.java

Make the RegisteredSErvices Cache not allow the registered service for a

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

SyncAdapterType.aidl

- clean up the sync settings names to:

2009-06-23 15:53:16 -07:00

SyncAdapterType.java

add a supportsUploading flag in the SyncAdapter description and honor it in the SyncManager

2009-08-20 13:52:22 -07:00

SyncContext.java

add an IPC for sync initialization

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

SyncManager.java

am 5e5eb393: Merge change Id572ffc7 into eclair

2009-10-29 13:44:08 -07:00

SyncResult.aidl

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

SyncResult.java

changes from Sync Manager API Review: bug 2164262

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

SyncStateContentProviderHelper.java

do not merge: cherrypicked 3710f39096 from master branch

2009-08-15 22:40:25 -07:00

SyncStats.aidl

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

SyncStats.java

- add a reset to EntityIterator to allow it to go back to the beginning

2009-08-20 17:18:58 -07:00

SyncStatusInfo.aidl

Rewrite SyncStorageEngine to use flat files and in-memory data structures.

2009-05-05 15:40:53 -07:00

SyncStatusInfo.java

Keep track of 'initial' sync state in SyncStatusInfo

2009-09-22 14:41:46 -07:00

SyncStatusObserver.java

- clean up the sync settings names to:

2009-06-23 15:53:16 -07:00

SyncStorageEngine.java

Work on issue #2163789: Way too much logging

2009-10-04 14:48:47 -07:00

TempProviderSyncAdapter.java

make syncadapter set whether the account is syncable

2009-08-18 11:06:52 -07:00

TempProviderSyncResult.java

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

UriMatcher.java

AI 144034: am: CL 144032 Added missing import to fix breakage caused by CL 144008.

2009-04-02 09:16:44 -07:00