diff options
author | Chung-yih Wang <cywang@google.com> | 2010-09-20 22:48:09 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2010-09-20 22:48:09 -0700 |
commit | 83af4fbb0e5c28506a77fc508056c5022b9a71eb (patch) | |
tree | da7aaacadff3f6e935aeae103e57efff4637e505 | |
parent | 2d19a676860bf773c984315fe03d9568913f9314 (diff) | |
parent | 4c571a62b1a4fb71585179bce84246b55097b47e (diff) | |
download | frameworks_base-83af4fbb0e5c28506a77fc508056c5022b9a71eb.zip frameworks_base-83af4fbb0e5c28506a77fc508056c5022b9a71eb.tar.gz frameworks_base-83af4fbb0e5c28506a77fc508056c5022b9a71eb.tar.bz2 |
am 4c571a62: Fix the build.
Merge commit '4c571a62b1a4fb71585179bce84246b55097b47e' into gingerbread-plus-aosp
* commit '4c571a62b1a4fb71585179bce84246b55097b47e':
Fix the build.
-rw-r--r-- | telephony/java/com/android/internal/telephony/CallManager.java | 21 |
1 files changed, 0 insertions, 21 deletions
diff --git a/telephony/java/com/android/internal/telephony/CallManager.java b/telephony/java/com/android/internal/telephony/CallManager.java index 49b7a72..23cb42a 100644 --- a/telephony/java/com/android/internal/telephony/CallManager.java +++ b/telephony/java/com/android/internal/telephony/CallManager.java @@ -355,27 +355,6 @@ public final class CallManager { return getFirstActiveRingingCall().getPhone(); } - /** - * unregister phone from CallManager - * @param phone - */ - public void unregisterPhone(Phone phone) { - if (phone != null && mPhones.contains(phone)) { - mPhones.remove(phone); - mRingingCalls.remove(phone.getRingingCall()); - mBackgroundCalls.remove(phone.getBackgroundCall()); - mForegroundCalls.remove(phone.getForegroundCall()); - unregisterForPhoneStates(phone); - if (phone == mDefaultPhone) { - if (mPhones.isEmpty()) { - mDefaultPhone = null; - } else { - mDefaultPhone = mPhones.get(0); - } - } - } - } - public void setAudioMode() { Context context = getContext(); if (context == null) return; |