commit 69050202ab926539f7b1d3f7efd9f688d5fbf8d3
author Christine Chen <christinech@google.com> Sat Sep 14 15:36:35 2013 -0700
committer Christine Chen <christinech@google.com> Sat Sep 14 15:36:35 2013 -0700
tree 7cb0da4e0e30bec19e14c7b912fb44578a79a802
parent bef8881a28cc796ba87379fbc5d279620a7e5d84

Fixes Conference call map null pointer exception

Bug: 10708375
Change-Id: Iaa95ec152f7cf6275d281feea47b3cea28cd9da1

src/com/android/phone/CallModeler.java

diff --git a/src/com/android/phone/CallModeler.java b/src/com/android/phone/CallModeler.java
index 52a7ef8..ae0ac48 100644
--- a/src/com/android/phone/CallModeler.java
+++ b/src/com/android/phone/CallModeler.java
@@ -145,12 +145,7 @@
 
         for (Entry<Connection, Call> entry : mConfCallMap.entrySet()) {
             if (entry.getValue().getCallId() == callId) {
-                if (entry.getValue().getChildCallIds().size() == 0) {
-                    return null;
-                }
-                final CallResult child = getCallWithId(entry.getValue().getChildCallIds().first());
-                return new CallResult(entry.getValue(), child.getActionableCall(),
-                        child.getConnection());
+                return new CallResult(entry.getValue(), entry.getKey());
             }
         }
         return null;