commit e6147f0c4bf8f6f1acf77831673cf5fe8fdd02c3
author Fabrice Di Meglio <fdimeglio@google.com> Mon Sep 27 02:36:40 2010 -0700
committer Android Git Automerger <android-git-automerger@android.com> Mon Sep 27 02:36:40 2010 -0700
tree fb43eca6119afa2d02c9124fbb605ea526229e7e
parent bd642aafb70b0e088d1379ddb685d3ed9172436f
parent 514a455f2a63d6b3366b848a585d99e8680f69aa

am 514a455f: am 28fa220c: Merge "Fix bug #2585298 (google calendar sync clears eventTimezone field for recurring allDay events)" into gingerbread

Merge commit '514a455f2a63d6b3366b848a585d99e8680f69aa'

* commit '514a455f2a63d6b3366b848a585d99e8680f69aa':
  Fix bug #2585298 (google calendar sync clears eventTimezone field for recurring allDay events)

core/tests/coretests/src/android/pim/RecurrenceSetTest.java

diff --git a/core/tests/coretests/src/android/pim/RecurrenceSetTest.java b/core/tests/coretests/src/android/pim/RecurrenceSetTest.java
index 64cd6c4..5d01ba0 100644
--- a/core/tests/coretests/src/android/pim/RecurrenceSetTest.java
+++ b/core/tests/coretests/src/android/pim/RecurrenceSetTest.java
@@ -46,7 +46,7 @@
         String recurrence = "DTSTART;VALUE=DATE:20090821\nDTEND;VALUE=DATE:20090822\n"
                 + "RRULE:FREQ=YEARLY;WKST=SU";
         verifyPopulateContentValues(recurrence, "FREQ=YEARLY;WKST=SU", null,
-                null, null, 1250812800000L, null, "P1D", 1);
+                null, null, 1250812800000L, "UTC", "P1D", 1);
     }
 
     // Test 2 day all-day event
@@ -55,7 +55,7 @@
         String recurrence = "DTSTART;VALUE=DATE:20090821\nDTEND;VALUE=DATE:20090823\n"
                 + "RRULE:FREQ=YEARLY;WKST=SU";
         verifyPopulateContentValues(recurrence, "FREQ=YEARLY;WKST=SU", null,
-                null, null, 1250812800000L, null,  "P2D", 1);
+                null, null, 1250812800000L, "UTC",  "P2D", 1);
     }
 
     // run populateContentValues and verify the results