Merge commit '231e01e7922abae0b33f0aec95275a5cc1b0209d' into eclair-mr2-plus-aosp
* commit '231e01e7922abae0b33f0aec95275a5cc1b0209d':
Make ContentValuesBuilder a separate file.
Merge commit 'd14ea3c7d7278695b9c51c243949de88cf38a1a4' into eclair-mr2-plus-aosp
* commit 'd14ea3c7d7278695b9c51c243949de88cf38a1a4':
Introduce ContentValuesBuilder and make tests easier to read.
Merge commit '66da163d4115688a8be7abb96c409a9858f9a8cd' into eclair-mr2-plus-aosp
* commit '66da163d4115688a8be7abb96c409a9858f9a8cd':
Move some useful logic to VCardTestsBase.java
Merge commit '473bbd2140a2515a6a9a450ee955a790e0b6dcff'
* commit '473bbd2140a2515a6a9a450ee955a790e0b6dcff':
Instead of a raw AIDL interface, give DropBox a Java
Merge commit 'f5633bc7e2fddbd1104d129b9d55d74fa8c2666b' into eclair-mr2-plus-aosp
* commit 'f5633bc7e2fddbd1104d129b9d55d74fa8c2666b':
Fix test breakage in testNickNameV21().
Merge commit '3c828e24a950a7fa4d17e22b5afa37a4006126f0' into eclair-mr2-plus-aosp
* commit '3c828e24a950a7fa4d17e22b5afa37a4006126f0':
Add partial support of Android-specific properties.
Merge commit '952402704a175ba27f6c89dff1ada634c5ce5626' into eclair-mr2-plus-aosp
* commit '952402704a175ba27f6c89dff1ada634c5ce5626':
Instead of a raw AIDL interface, give DropBox a Java
In the near future, all the values which cannot be converted to
vCard property is expressed as "X-ANDROID-CUSTOM" property + MIME_TYPE.
Example (Nick name):
X-ANDROID-CUSTOM:vnd.android.cursor.item/nickname;Nicky;;;;;;;;;;;;;
All the data are stored ordered by its column name ("data1" - "data15").
Currently the code assumes the max num is 15.
Internal Issue number: 2079082
interface (android.os.DropBox); move the Binder interface
behind the scenes. Make DropBoxEntry into DropBox.Entry.
Make it possible to get a dropbox from an (Application)Context
with the usual getSystemService(DROPBOX_SERVICE) type thing.
Update the tests accordingly.
- Added new functions to PerformanceCollector and PerformanceResultsWriter
- Modified unit tests to test new functionality and fix flakiness reported in
2218327 and 2118268
- Added PerformanceCollectorTest to small suite
Merge commit 'd263a064f7a77768c3e70a98f286960b67dc1aa5' into eclair-mr2-plus-aosp
* commit 'd263a064f7a77768c3e70a98f286960b67dc1aa5':
Add a test for vCard composer.
Sample hierarchial URL, from my ContactsProvider test case:
content://com.android.contacts/data?account_name=braddroid%40gmail.com&account_type=com.google.GAIA&caller_is_syncadapter=true
Without this patch: (fetching the "account_name" parameter)
10000 iters: 0.5293 ms average
10000 iters: 0.5119 ms average
10000 iters: 0.5158 ms average
With this patch, rewriting it to not allocate memory (no implicit
StringBuilder), but still no caching:
1) when it needs to decode something (i.e account_name above;
allocates memory)
50000 iters: 0.28724 ms average
50000 iters: 0.31774 ms average
50000 iters: 0.28764 ms average
2) when it doesn't need to decode (and thus allocate memory,
i.e. account_type above)
50000 iters: 0.0954 ms average
50000 iters: 0.09124 ms average
50000 iters: 0.09088 ms average
Merge commit '54616f3435e67029006d2f77462c61ed0635a3f6' into eclair-mr2-plus-aosp
* commit '54616f3435e67029006d2f77462c61ed0635a3f6':
Make MockCursor class a part of public SDK.
With this class, external developers will be able to reduce their
redundant work related to testing around ContentProvider/ContentResolver.
Internal Issue number: 2181010
Merge commit '2a2805b7fbd25ee11ad554e33bf34dbb2e8b71c5' into eclair-mr2-plus-aosp
* commit '2a2805b7fbd25ee11ad554e33bf34dbb2e8b71c5':
It turns out to be useful to allow enumeration on a per-tag basis,
* changes:
It turns out to be useful to allow enumeration on a per-tag basis, and it's easy to support based on the data structures we have, so add a tag parameter to getNextEvent().
Now, basic tests are almost ready.
TODO:
- importer test toward multiple vCard input (though it was tested with real usage)
- exporter tests for multiple composition
- tests with non-Ascii
- tests with special types like TYPE_DOCOMO
ISSUE:
In order to fully check the validity of exporter, we may have to develop
some vCard importer which rejects vCard which is valid but a kind of dubious.
Internal Issue Number: 2160039
Merge commit '5c8a80b8fc7a25dda269cd16e0b90b35227fd625' into eclair-mr2-plus-aosp
* commit '5c8a80b8fc7a25dda269cd16e0b90b35227fd625':
Framework-side DropBox service that maintains a size-bounded
queue of data chunks (sort of a blob-oriented logcat).
In the future, this will be coupled with a revised checkin service that
would actually upload this data.
Merge commit 'd48e25d4e3278c5e975db01adb98661ee59923fe' into eclair-mr2-plus-aosp
* commit 'd48e25d4e3278c5e975db01adb98661ee59923fe':
Add a new TestSuites: VCardTests
Now, the following command is available.
adb shell am instrument -w -e class com.android.unit_tests.vcard.VCardTests com.android.unit_tests/android.test.InstrumentationTestRunner
Internal Issuer number: 2160039