diff options
| author | wangqi <wangqi@google.com> | 2017-07-05 12:03:29 -0700 |
|---|---|---|
| committer | Eric Erfanian <erfanian@google.com> | 2017-07-10 10:45:33 -0700 |
| commit | 1803be7a4f88ebf05dddc99fcce6781f7ee937f9 (patch) | |
| tree | da1e342d1b56b69266b75c9467f10491b968a432 /java | |
| parent | ce5ad9c817de101f5685d6f63e0a90a02ebc4b2b (diff) | |
| download | android_packages_apps_Dialer-1803be7a4f88ebf05dddc99fcce6781f7ee937f9.tar.gz android_packages_apps_Dialer-1803be7a4f88ebf05dddc99fcce6781f7ee937f9.tar.bz2 android_packages_apps_Dialer-1803be7a4f88ebf05dddc99fcce6781f7ee937f9.zip | |
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
Diffstat (limited to 'java')
| -rw-r--r-- | java/com/android/incallui/disconnectdialog/EnableWifiCallingPrompt.java | 2 |
1 files changed, 1 insertions, 1 deletions
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", |