commit 41a89b8ed8beed7831612bb284e2ca2381969729
author Marc Blank <mblank@google.com> Mon Mar 01 20:47:55 2010 -0800
committer Marc Blank <mblank@google.com> Mon Mar 01 20:50:05 2010 -0800
tree 0f2252efd09d64266167323f14ff9a5ba941dd04
parent 30d2d4ea74cfca9d27dfd495cebc8387b8f2454d

Fix #2450322 (ANR's in email)

* My Calendar observer registration code was storing the wrong id
  in the hash map.  Because of this, the code could be called again
  and again, generating lots of extraneous queries and generally
  creating a lot of havoc, including ANR's

Bug: 2450322
Change-Id: I03db8156ee99a0c7243a9188558dffc6a843a65a

src/com/android/exchange/SyncManager.java

diff --git a/src/com/android/exchange/SyncManager.java b/src/com/android/exchange/SyncManager.java
index 5e0e594..f9bdc97 100644
--- a/src/com/android/exchange/SyncManager.java
+++ b/src/com/android/exchange/SyncManager.java
@@ -615,7 +615,7 @@
         CalendarObserver observer = new CalendarObserver(mHandler, account);
         if (observer.mCalendarId != 0) {
             // If we find the Calendar (and we'd better) register it and store it in the map
-            mCalendarObservers.put(observer.mCalendarId, observer);
+            mCalendarObservers.put(account.mId, observer);
             mResolver.registerContentObserver(
                     ContentUris.withAppendedId(Calendars.CONTENT_URI, observer.mCalendarId), false,
                     observer);