summaryrefslogtreecommitdiff
path: root/InCallUI/src/com/android/incallui/InCallActivity.java
diff options
context:
space:
mode:
authorChiao Cheng <chiaocheng@google.com>2013-08-22 18:36:24 -0700
committerChiao Cheng <chiaocheng@google.com>2013-08-28 12:09:20 -0700
commit42373eb59cbef15ec61ebb5c919031f293291a53 (patch)
tree7af3883675986a4783d2931ebcfaaabceec5727f /InCallUI/src/com/android/incallui/InCallActivity.java
parent6002b83345c66319a8839912b326a0f84d7a1d9a (diff)
Major fixes for in call to work with reverse number lookup.
- Separated caller info data into CallIdentification and switch callbacks to use it where call state is un-necessary. - Changed mCallList.update() method to be onIncoming(). - Catch all exceptions from service methods so errors do not vanish. - Fixed bind failure cases which led to DeadObjectException. - Changed local contact lookup to only occur for incoming calls. - Fixed CallCardPresenter to start contact search upon isntantiation instead of waiting for next call update. - Convert ContactInfoCache to singleton to avoid race condition where it's not initialized. - Handle cases where primary call may be null when we find a contact. - Fixed race conditions in CallButtonPresenter where audio mode is being set before ui is ready. - Fixed race condition in AnswerPresenter where state change was being called before ui is ready. - Changes to CallCardPresenter to support lookup for conference calls. Bug: 10413515 Bug: 10390984 Change-Id: I9fc4f2f35e8f5aad33c301b3c5c93132634cb63c
Diffstat (limited to 'InCallUI/src/com/android/incallui/InCallActivity.java')
-rw-r--r--InCallUI/src/com/android/incallui/InCallActivity.java8
1 files changed, 2 insertions, 6 deletions
diff --git a/InCallUI/src/com/android/incallui/InCallActivity.java b/InCallUI/src/com/android/incallui/InCallActivity.java
index ec5002f73..5915ecfb4 100644
--- a/InCallUI/src/com/android/incallui/InCallActivity.java
+++ b/InCallUI/src/com/android/incallui/InCallActivity.java
@@ -292,14 +292,11 @@ public class InCallActivity extends Activity {
mainPresenter.getAudioModeProvider());
mCallButtonFragment.getPresenter().setProximitySensor(
mainPresenter.getProximitySensor());
- mCallCardFragment.getPresenter().setAudioModeProvider(
- mainPresenter.getAudioModeProvider());
- mCallCardFragment.getPresenter().setContactInfoCache(
- mainPresenter.getContactInfoCache());
+ final CallCardPresenter presenter = mCallCardFragment.getPresenter();
+ presenter.setAudioModeProvider(mainPresenter.getAudioModeProvider());
mainPresenter.addListener(mCallButtonFragment.getPresenter());
mainPresenter.addListener(mCallCardFragment.getPresenter());
- mainPresenter.addListener(mAnswerFragment.getPresenter());
// setting activity should be last thing in setup process
mainPresenter.setActivity(this);
@@ -311,7 +308,6 @@ public class InCallActivity extends Activity {
mainPresenter.removeListener(mCallButtonFragment.getPresenter());
mainPresenter.removeListener(mCallCardFragment.getPresenter());
- mainPresenter.removeListener(mAnswerFragment.getPresenter());
mainPresenter.setActivity(null);
}