Revert "b/2622128 Fix crash from editEvent and EventInfoActivity"

This reverts commit b6a9b7130b754ef2c965a4ddb6134bc82e8a605c. Moving this to
master instead of froyo.

diff --git a/src/com/android/calendar/DeleteEventHelper.java b/src/com/android/calendar/DeleteEventHelper.java
index 44c1312..ca80c90 100644 (file)
--- a/src/com/android/calendar/DeleteEventHelper.java
+++ b/src/com/android/calendar/DeleteEventHelper.java
@@ -124,9 +124,6 @@ public class DeleteEventHelper {
         new DialogInterface.OnClickListener() {
         public void onClick(DialogInterface dialog, int button) {
             deleteExceptionEvent();
-            if (mExitWhenDone) {
-                mParent.finish();
-            }
         }
     };
 

diff --git a/src/com/android/calendar/EditEvent.java b/src/com/android/calendar/EditEvent.java
index 3966e23..1f646b5 100644 (file)
--- a/src/com/android/calendar/EditEvent.java
+++ b/src/com/android/calendar/EditEvent.java
@@ -131,7 +131,6 @@ public class EditEvent extends Activity implements View.OnClickListener,
             Events.VISIBILITY,        // 13
             Events.OWNER_ACCOUNT,     // 14
             Events.HAS_ATTENDEE_DATA, // 15
-            Events.ORIGINAL_EVENT,    // 16 used for deleting exception events
     };
     private static final int EVENT_INDEX_ID = 0;
     private static final int EVENT_INDEX_TITLE = 1;

diff --git a/src/com/android/calendar/EventInfoActivity.java b/src/com/android/calendar/EventInfoActivity.java
index 23cd9e9..8f4b4cc 100644 (file)
--- a/src/com/android/calendar/EventInfoActivity.java
+++ b/src/com/android/calendar/EventInfoActivity.java
@@ -116,7 +116,6 @@ public class EventInfoActivity extends Activity implements View.OnClickListener,
         // TODO Events.GUESTS_CAN_INVITE_OTHERS has not been implemented in calendar provider
         Events.GUESTS_CAN_INVITE_OTHERS, // 15
         Events.ORGANIZER,            // 16
-        Events.ORIGINAL_EVENT        // 17 do not remove; used in DeleteEventHelper
     };
     private static final int EVENT_INDEX_ID = 0;
     private static final int EVENT_INDEX_TITLE = 1;