commit da0ed6462ee390bee56806d48ea0a011ef24619a
author Andrew Lee <anwlee@google.com> Mon Mar 30 18:59:24 2015 +0000
committer android-build-merger <android-build-merger@google.com> Mon Mar 30 18:59:24 2015 +0000
tree b7fb9e657bb828dd3eceb51dfb2b3bb9f3e17d44
parent 0536d11757f3c824cc0efb3f822a6e0c3b9daeec
parent d3d8c2691a9fcad737f9e676d60625bd003a753f

Null-protect reference to mOriginalConnection.
automerge: d3d8c26

* commit 'd3d8c2691a9fcad737f9e676d60625bd003a753f':
  Null-protect reference to mOriginalConnection.

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 224838e..71bd810 100644
--- a/src/com/android/services/telephony/TelephonyConnection.java
+++ b/src/com/android/services/telephony/TelephonyConnection.java
@@ -876,8 +876,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;