From 1803be7a4f88ebf05dddc99fcce6781f7ee937f9 Mon Sep 17 00:00:00 2001
From: wangqi <wangqi@google.com>
Date: Wed, 5 Jul 2017 12:03:29 -0700
Subject: 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 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'java')

diff --git a/java/com/android/incallui/disconnectdialog/EnableWifiCallingPrompt.java b/java/com/android/incallui/disconnectdialog/EnableWifiCallingPrompt.java
index da0c9d6be..a0ca8cd04 100644
--- a/java/com/android/incallui/disconnectdialog/EnableWifiCallingPrompt.java
+++ b/java/com/android/incallui/disconnectdialog/EnableWifiCallingPrompt.java
@@ -41,7 +41,7 @@ public class EnableWifiCallingPrompt implements DisconnectDialog {
   @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",
-- 
cgit v1.2.3