Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am dfb7bc8c: Merge change 26821 into eclair

Browse Source 
Merge commit 'dfb7bc8c87d8fe694164038cf292c9913fae9bdb' into eclair-plus-aosp

* commit 'dfb7bc8c87d8fe694164038cf292c9913fae9bdb':
  Make removeOnAccountsUpdateListener cope with null handlers.
This commit is contained in:
Bryan Mawhinney
2009-09-24 14:38:58 -07:00
committed by Android Git Automerger
parent 93bc8cab98 dfb7bc8c87
commit cbafa09444
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/java/android/accounts/AccountManager.java
View File

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