commit 535c02e153d7e7f1bb3f42c9948f444d541269e1
author The Android Automerger <android-build@android.com> Wed Apr 18 07:03:29 2012 -0700
committer The Android Automerger <android-build@android.com> Wed Apr 18 07:03:29 2012 -0700
tree 0008c9cca43b40963cf5cad126a2b07c3a252e9a
parent 1546ea7c0d8791a690af9326904f1472321c95df
parent 49613988bb98fb69b0b681172bf901cffa41ab66

merge in jb-release history after reset to master

src/com/android/calendarcommon/RecurrenceSet.java

diff --git a/src/com/android/calendarcommon/RecurrenceSet.java b/src/com/android/calendarcommon/RecurrenceSet.java
index cbf4ce7..d8fb7cf 100644
--- a/src/com/android/calendarcommon/RecurrenceSet.java
+++ b/src/com/android/calendarcommon/RecurrenceSet.java
@@ -317,14 +317,14 @@
         if (values.containsKey(CalendarContract.Events.DTSTART)) {
             dtstart = values.getAsLong(CalendarContract.Events.DTSTART);
         }
-        String duration = values.getAsString(CalendarContract.Events.DURATION);
-        String tzid = values.getAsString(CalendarContract.Events.EVENT_TIMEZONE);
-        String rruleStr = values.getAsString(CalendarContract.Events.RRULE);
-        String rdateStr = values.getAsString(CalendarContract.Events.RDATE);
-        String exruleStr = values.getAsString(CalendarContract.Events.EXRULE);
-        String exdateStr = values.getAsString(CalendarContract.Events.EXDATE);
-        Integer allDayInteger = values.getAsInteger(CalendarContract.Events.ALL_DAY);
-        boolean allDay = (null != allDayInteger) ? (allDayInteger == 1) : false;
+        final String duration = values.getAsString(CalendarContract.Events.DURATION);
+        final String tzid = values.getAsString(CalendarContract.Events.EVENT_TIMEZONE);
+        final String rruleStr = values.getAsString(CalendarContract.Events.RRULE);
+        final String rdateStr = values.getAsString(CalendarContract.Events.RDATE);
+        final String exruleStr = values.getAsString(CalendarContract.Events.EXRULE);
+        final String exdateStr = values.getAsString(CalendarContract.Events.EXDATE);
+        final Integer allDayInteger = values.getAsInteger(CalendarContract.Events.ALL_DAY);
+        final boolean allDay = (null != allDayInteger) ? (allDayInteger == 1) : false;
 
         if ((dtstart == -1) ||
             (TextUtils.isEmpty(duration))||
@@ -370,7 +370,7 @@
         return true;
     }
 
-    private static void addPropertiesForRuleStr(ICalendar.Component component,
+    public static void addPropertiesForRuleStr(ICalendar.Component component,
                                                 String propertyName,
                                                 String ruleStr) {
         if (TextUtils.isEmpty(ruleStr)) {
@@ -430,7 +430,7 @@
             foldedIcalContent).replaceAll("");
     }
 
-    private static void addPropertyForDateStr(ICalendar.Component component,
+    public static void addPropertyForDateStr(ICalendar.Component component,
                                               String propertyName,
                                               String dateStr) {
         if (TextUtils.isEmpty(dateStr)) {