commit d3d8c2691a9fcad737f9e676d60625bd003a753f
author Andrew Lee <anwlee@google.com> Mon Mar 30 11:19:22 2015 -0700
committer Andrew Lee <anwlee@google.com> Mon Mar 30 11:19:22 2015 -0700
tree 7a02d583d68688018ca8da10f23ace51c56b56bf
parent 87050c69ed4c62d5fddc494eb1a9b85a23d78214

Null-protect reference to mOriginalConnection.

Bug: 19966509
Change-Id: I7126d3934f04ff797417e8e509fafe38c79d0c76

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 be04641..3d9a7e0 100644
--- a/src/com/android/services/telephony/TelephonyConnection.java
+++ b/src/com/android/services/telephony/TelephonyConnection.java
@@ -869,8 +869,9 @@
     }
 
     private void updateStatusHints() {
-        if (mIsWifi && (mOriginalConnection.getState() == Call.State.INCOMING
-                || mOriginalConnection.getState() == Call.State.ACTIVE)) {
+        if (mIsWifi && mOriginalConnection != null &&
+                (mOriginalConnection.getState() == Call.State.INCOMING
+                        || mOriginalConnection.getState() == Call.State.ACTIVE)) {
             int labelId = mOriginalConnection.getState() == Call.State.INCOMING
                     ? R.string.status_hint_label_incoming_wifi_call
                     : R.string.status_hint_label_wifi_call;