diff options
| author | Chung-yih Wang <cywang@google.com> | 2010-08-10 23:44:52 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-08-10 23:44:52 -0700 |
| commit | ea65ec23f6dc18e978ab6dcf23d3c2b27a0c2109 (patch) | |
| tree | f050daf7243b5a04e0f60c7f0f472deb3b1d2bea | |
| parent | 3fa3403e2ee98a66b1b1b83b6f65980163609b6d (diff) | |
| parent | 0a6db9bebbd58c6a7e2ad2070d2649a2be57a09a (diff) | |
| download | frameworks_base-ea65ec23f6dc18e978ab6dcf23d3c2b27a0c2109.zip frameworks_base-ea65ec23f6dc18e978ab6dcf23d3c2b27a0c2109.tar.gz frameworks_base-ea65ec23f6dc18e978ab6dcf23d3c2b27a0c2109.tar.bz2 | |
am 0a6db9be: am 2725a655: Fix a bug in unregisterPhone().
Merge commit '0a6db9bebbd58c6a7e2ad2070d2649a2be57a09a'
* commit '0a6db9bebbd58c6a7e2ad2070d2649a2be57a09a':
Fix a bug in unregisterPhone().
| -rw-r--r-- | telephony/java/com/android/internal/telephony/CallManager.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/telephony/java/com/android/internal/telephony/CallManager.java b/telephony/java/com/android/internal/telephony/CallManager.java index 63bdb99..2934e6a 100644 --- a/telephony/java/com/android/internal/telephony/CallManager.java +++ b/telephony/java/com/android/internal/telephony/CallManager.java @@ -215,7 +215,7 @@ public final class CallManager { * @param phone */ public void unregisterPhone(Phone phone) { - if (phone != null && !mPhones.contains(phone)) { + if (phone != null && mPhones.contains(phone)) { mPhones.remove(phone); mRingingCalls.remove(phone.getRingingCall()); mBackgroundCalls.remove(phone.getBackgroundCall()); |