am dfb7bc8c: Merge change 26821 into eclair

Merge commit 'dfb7bc8c87d8fe694164038cf292c9913fae9bdb' into eclair-plus-aosp

* commit 'dfb7bc8c87d8fe694164038cf292c9913fae9bdb':
  Make removeOnAccountsUpdateListener cope with null handlers.

core/java/android/accounts/AccountManager.java

@@ -859,9 +859,10 @@ public class AccountManager {
             throw new IllegalArgumentException("the listener is null");
         }
         synchronized (mAccountsUpdatedListeners) {
-            if (mAccountsUpdatedListeners.remove(listener) == null) {
+            if (!mAccountsUpdatedListeners.containsKey(listener)) {
                 throw new IllegalStateException("this listener was not previously added");
             }
+            mAccountsUpdatedListeners.remove(listener);
             if (mAccountsUpdatedListeners.isEmpty()) {
                 mContext.unregisterReceiver(mAccountsChangedBroadcastReceiver);
             }