commit 1803be7a4f88ebf05dddc99fcce6781f7ee937f9
author wangqi <wangqi@google.com> Wed Jul 05 12:03:29 2017 -0700
committer Eric Erfanian <erfanian@google.com> Mon Jul 10 10:45:33 2017 -0700
tree da1e342d1b56b69266b75c9467f10491b968a432
parent ce5ad9c817de101f5685d6f63e0a90a02ebc4b2b

Fix NPE crash when haning up conference call.

The reason of disconnect cause could be null.
This is regression caused by cl/160563754

Bug: 63156395,63302714
Test: manual
PiperOrigin-RevId: 160987545
Change-Id: I3fd726947601f55d5dc917b11626b64bfc9d0135

java/com/android/incallui/disconnectdialog/EnableWifiCallingPrompt.java

diff --git a/java/com/android/incallui/disconnectdialog/EnableWifiCallingPrompt.java b/java/com/android/incallui/disconnectdialog/EnableWifiCallingPrompt.java
index da0c9d6..a0ca8cd 100644
--- a/java/com/android/incallui/disconnectdialog/EnableWifiCallingPrompt.java
+++ b/java/com/android/incallui/disconnectdialog/EnableWifiCallingPrompt.java
@@ -41,7 +41,7 @@
   @Override
   public boolean shouldShow(DisconnectCause disconnectCause) {
     String reason = disconnectCause.getReason();
-    if (reason.startsWith(REASON_WIFI_ON_BUT_WFC_OFF)) {
+    if (reason != null && reason.startsWith(REASON_WIFI_ON_BUT_WFC_OFF)) {
       LogUtil.i(
           "EnableWifiCallingPrompt.shouldShowPrompt",
           "showing prompt for disconnect cause: %s",