Merge commit 'fc96523b94ddaad1da39bee0d6861e2186d8479c'
* commit 'fc96523b94ddaad1da39bee0d6861e2186d8479c':
move event log tags used by SyncAdapter into a local .logtags file
Merge commit '328c0e7986aa6bb7752ec6de3da9c999920bb55f' into eclair-mr2-plus-aosp
* commit '328c0e7986aa6bb7752ec6de3da9c999920bb55f':
- removed the concept of Entity from the ContentProvider APIs
Merge commit 'eb68a226563f60265663f1688dda77c4f909e5de'
* commit 'eb68a226563f60265663f1688dda77c4f909e5de':
Add bindService API to not bring ot foreground.
Merge commit '15650af4ab1df7fb84839162f9409d88cb4a3ccc'
* commit '15650af4ab1df7fb84839162f9409d88cb4a3ccc':
Updating list of standard Intents in android.content.Intent
- 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 code to use the new APIs
This obsoletes the following:
- The need to run SearchDialog in the system process.
- The global search mode code in SearchDialog.
- The GlobalSearch package.
- The search widget built into Launcher.
I will remove these in future changes.
Change-Id: I154386b1d6be73cfeab8376b6959a1dc5483e5f0
Add a new flag for bindService that tells the system to not bring the
target service's process in to the foreground scheduling class. This is
used by the sync system to not cause the current sync adapter to come to
the foreground as it is running.
Also some small improvements to the debug output of the process list
of oom adj and scheduling info.
Merge commit 'd59fb6e7435b57d83662b196f5430e6f2bc5427b' into eclair-mr2
* commit 'd59fb6e7435b57d83662b196f5430e6f2bc5427b':
Updating list of standard Intents in android.content.Intent
Merge commit '1067c3cbab73a4bc75a2ebd2e3c51077db96fa24' into eclair-mr2
* commit '1067c3cbab73a4bc75a2ebd2e3c51077db96fa24':
remove an old STOPSHIP comment
Merge commit '8ad6ec2eb4a58a6dad34be60d49f32a53f2419f4'
* commit '8ad6ec2eb4a58a6dad34be60d49f32a53f2419f4':
Implement new MockContentProvider. Also make ContentProvider aware of the class.
Merge commit 'a8dd0a545409af281b73e483dc203f6e3f8d1de6'
* commit 'a8dd0a545409af281b73e483dc203f6e3f8d1de6':
don't reschedule syncs that failed with a tooManyRetries error
Rename the old MockContentProvider to MockIContentProvider since it is
more appropriate name.
Detail:
Current developers inevitably depend on the backend used by ContentProvider,
which is useful but not ideal nor "testable" from the view of them.
Current MockContentResolver only accepts exact "ContentProvider" class, not
IContentProvider interface, since we want to hide "IContentProvider" while
the old MockContentProvider implements IContentProvider and as a result some
methods we want to hide may be exposed to the public SDK now and probably
for the future.
On the other hand, ContentProvider is not interface but an exact class
heavily depends on the internal logic and not suitable for external
developers to use for tests.
The new MockContentProvider introduces the mock implementation
for ContentProvider.
It extends ContentProvider, so "is" ContentProvider, but tries to avoid
depending on any backend System like IPC in Android, etc.
This should be useful from the view of application developers who do not
want to be confused with ContentProvider/ContentResolver backend
implementation "at all" and want to use MockContentResolver without
any other ContentProvider implementations tightly connected to the
external worlds.
Merge commit '0ce8431c15078e095a22a123dbabcd91049a9652' into eclair-mr2
* commit '0ce8431c15078e095a22a123dbabcd91049a9652':
don't reschedule syncs that failed with a tooManyRetries error
Merge commit 'dbed53504f515337ccc2f60248bb589dff0f24fb'
* commit 'dbed53504f515337ccc2f60248bb589dff0f24fb':
Add a new field to Intent that allows you to give a hint about what on screen caused the intent to
Merge commit 'c7a63eea8d3d346addaaf892b5bbe0aa80651640' into eclair-mr2
* commit 'c7a63eea8d3d346addaaf892b5bbe0aa80651640':
Add a new field to Intent that allows you to give a hint about what on screen caused the intent to
There was a lock in AssetManager that purported to be per-instance (mSync)
but was actually static. A lot of code used it like it was per-instance,
but this would actually block all instances. This is now changed to fix
the name and make everything except the actual static data lock on the
specific AssetManager instance.
Change-Id: Ie8e9ad60f962184e76b2301f7a2790d0c2487063
