diff options
| author | Daisuke Miyakawa <dmiyakawa@google.com> | 2009-10-28 23:33:21 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2009-10-28 23:33:21 -0700 |
| commit | d7185d0bd250ff5f006ea94d305539ac7d499977 (patch) | |
| tree | 46a2d90b8db82c3ac68b6068e1164355764519f3 | |
| parent | 33728557540d9033ff396f7a2ddd4fb304fdedcd (diff) | |
| parent | f5633bc7e2fddbd1104d129b9d55d74fa8c2666b (diff) | |
| download | frameworks_base-d7185d0bd250ff5f006ea94d305539ac7d499977.zip frameworks_base-d7185d0bd250ff5f006ea94d305539ac7d499977.tar.gz frameworks_base-d7185d0bd250ff5f006ea94d305539ac7d499977.tar.bz2 | |
am f5633bc7: Fix test breakage in testNickNameV21().
Merge commit 'f5633bc7e2fddbd1104d129b9d55d74fa8c2666b' into eclair-mr2-plus-aosp
* commit 'f5633bc7e2fddbd1104d129b9d55d74fa8c2666b':
Fix test breakage in testNickNameV21().
| -rw-r--r-- | core/java/android/pim/vcard/VCardComposer.java | 2 | ||||
| -rw-r--r-- | tests/AndroidTests/src/com/android/unit_tests/vcard/VCardExporterTests.java | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/core/java/android/pim/vcard/VCardComposer.java b/core/java/android/pim/vcard/VCardComposer.java index 33581c9..6476e40 100644 --- a/core/java/android/pim/vcard/VCardComposer.java +++ b/core/java/android/pim/vcard/VCardComposer.java @@ -1490,7 +1490,7 @@ public class VCardComposer { return; } - for (int i = 0; i < Constants.MAX_DATA_COLUMN; i++) { + for (int i = 1; i <= Constants.MAX_DATA_COLUMN; i++) { String value = contentValues.getAsString("data" + i); if (value == null) { value = ""; diff --git a/tests/AndroidTests/src/com/android/unit_tests/vcard/VCardExporterTests.java b/tests/AndroidTests/src/com/android/unit_tests/vcard/VCardExporterTests.java index f1a46d6..cfa9ab3 100644 --- a/tests/AndroidTests/src/com/android/unit_tests/vcard/VCardExporterTests.java +++ b/tests/AndroidTests/src/com/android/unit_tests/vcard/VCardExporterTests.java @@ -1279,7 +1279,7 @@ public class VCardExporterTests extends AndroidTestCase { VCardVerificationHandler handler = new VCardVerificationHandler(this, V21); handler.addNewVerifierWithEmptyName() - .addNodeWithOrder("X-ANDROID-CUSTOM", Nickname.CONTENT_ITEM_TYPE + ";Nicky"); + .addNodeWithOrder("X-ANDROID-CUSTOM", Nickname.CONTENT_ITEM_TYPE + ";Nicky;;;;;;;;;;;;;;"); // TODO: also test import part. |