commit dc563ddb5d13943f99d61ff468c96b5406bc3a0c
author Shriram Ganesh <sganesh@codeaurora.org> Fri Mar 20 22:26:31 2015 +0530
committer Etan Cohen <etancohen@google.com> Tue Jul 14 09:00:23 2015 -0700
tree a6d4cfc7dfdcef66fcc2afa77f0205352ccfed9a
parent 43d23ef3875d6f605c541ef6cafc5db1b891ea52

IMS: Fix crash during midcall disabled multicall SRVCC.

Avoid null pointer exception when handover state changed event
is handled by a closed TelephonyConnection by checking for validity
of mOriginalConnection.

BUG: 22405832
Change-Id: I2c5cfd86ec8e50f46ecc13b808884eea2d459764

src/com/android/services/telephony/TelephonyConnection.java

diff --git a/src/com/android/services/telephony/TelephonyConnection.java b/src/com/android/services/telephony/TelephonyConnection.java
index 8c09a95..d04a2a5 100644
--- a/src/com/android/services/telephony/TelephonyConnection.java
+++ b/src/com/android/services/telephony/TelephonyConnection.java
@@ -67,14 +67,21 @@
                     AsyncResult ar = (AsyncResult) msg.obj;
                     com.android.internal.telephony.Connection connection =
                          (com.android.internal.telephony.Connection) ar.result;
-                    if ((connection.getAddress() != null &&
-                                    mOriginalConnection.getAddress() != null &&
+                    if (mOriginalConnection != null) {
+                        if (connection != null &&
+                            ((connection.getAddress() != null &&
+                            mOriginalConnection.getAddress() != null &&
                             mOriginalConnection.getAddress().contains(connection.getAddress())) ||
-                            connection.getStateBeforeHandover() == mOriginalConnection.getState()) {
-                        Log.d(TelephonyConnection.this, "SettingOriginalConnection " +
-                                mOriginalConnection.toString() + " with " + connection.toString());
-                        setOriginalConnection(connection);
-                        mWasImsConnection = false;
+                            connection.getStateBeforeHandover() == mOriginalConnection.getState())) {
+                            Log.d(TelephonyConnection.this,
+                                    "SettingOriginalConnection " + mOriginalConnection.toString()
+                                            + " with " + connection.toString());
+                            setOriginalConnection(connection);
+                            mWasImsConnection = false;
+                        }
+                    } else {
+                        Log.w(TelephonyConnection.this,
+                                "MSG_HANDOVER_STATE_CHANGED: mOriginalConnection==null - invalid state (not cleaned up)");
                     }
                     break;
                 case MSG_RINGBACK_TONE: