commit 43bc74fa14664927998b3aca2b73904122615129
author Christine Chen <christinech@google.com> Mon Sep 09 17:21:53 2013 -0700
committer Christine Chen <christinech@google.com> Mon Sep 09 17:21:53 2013 -0700
tree 15e8f93641c8be6586820bf5e1fe409cee3841f5
parent 3e6e27d27d79fa027f39c46ea6333b876220bfc7

Fixes null pointer bug for conference call.

- Adds that a conference call can be the holding call in the background.

Bug: 10677856
Change-Id: I23176ed04ce3c3f0032a0e3c8d9b4c0e3285c5e2

InCallUI/src/com/android/incallui/ConferenceManagerPresenter.java

diff --git a/InCallUI/src/com/android/incallui/ConferenceManagerPresenter.java b/InCallUI/src/com/android/incallui/ConferenceManagerPresenter.java
index 6b6f7d8..ccda4a5 100644
--- a/InCallUI/src/com/android/incallui/ConferenceManagerPresenter.java
+++ b/InCallUI/src/com/android/incallui/ConferenceManagerPresenter.java
@@ -60,7 +60,7 @@
 
     private void update(CallList callList) {
         mCallerIds = null;
-        mCallerIds = callList.getActiveCall().getChildCallIds().toArray(new Integer[0]);
+        mCallerIds = callList.getActiveOrBackgroundCall().getChildCallIds().toArray(new Integer[0]);
         mNumCallersInConference = mCallerIds.length;
         Log.v(this, "Number of calls is " + String.valueOf(mNumCallersInConference));