b/2505788 Added check so we only dirty an event if an update occurred

onPause was updating the hasAlarm field even if it didn't change. Added a
check so we only update hasAlarms if it changed.

Change-Id: Ic986c877e24cf49009d6e72bafc47952ce5e63bd

diff --git a/src/com/android/calendar/EventInfoActivity.java b/src/com/android/calendar/EventInfoActivity.java
index 0888c40..54898a9 100644 (file)
--- a/src/com/android/calendar/EventInfoActivity.java
+++ b/src/com/android/calendar/EventInfoActivity.java
@@ -39,7 +39,6 @@ import android.net.Uri;
 import android.os.Bundle;
 import android.os.RemoteException;
 import android.pim.EventRecurrence;
-import android.preference.PreferenceManager;
 import android.provider.Calendar;
 import android.provider.ContactsContract;
 import android.provider.Calendar.Attendees;
@@ -218,6 +217,7 @@ public class EventInfoActivity extends Activity implements View.OnClickListener,
     private ArrayList<Integer> mReminderValues;
     private ArrayList<String> mReminderLabels;
     private int mDefaultReminderMinutes;
+    private boolean mOriginalHasAlarm;
 
     private DeleteEventHelper mDeleteEventHelper;
     private EditResponseHelper mEditResponseHelper;
@@ -398,6 +398,7 @@ public class EventInfoActivity extends Activity implements View.OnClickListener,
                 reminderCursor.close();
             }
         }
+        mOriginalHasAlarm = hasAlarm;
 
         // Setup the + Add Reminder Button
         View.OnClickListener addReminderOnClickListener = new View.OnClickListener() {
@@ -554,9 +555,12 @@ public class EventInfoActivity extends Activity implements View.OnClickListener,
             // Update the "hasAlarm" field for the event
             Uri uri = ContentUris.withAppendedId(Events.CONTENT_URI, mEventId);
             int len = reminderMinutes.size();
-            ContentValues values = new ContentValues();
-            values.put(Events.HAS_ALARM, (len > 0) ? 1 : 0);
-            cr.update(uri, values, null, null);
+            boolean hasAlarm = len > 0;
+            if (hasAlarm != mOriginalHasAlarm) {
+                ContentValues values = new ContentValues();
+                values.put(Events.HAS_ALARM, (len > 0) ? 1 : 0);
+                cr.update(uri, values, null, null);
+            }
         } catch (RemoteException e) {
             Log.w(TAG, "Ignoring exception: ", e);
         } catch (OperationApplicationException e) {