diff options
| author | Marcos Marado <mmarado@cyngn.com> | 2014-11-19 18:27:48 +0000 |
|---|---|---|
| committer | DO NOT USE <brint@cyngn.com> | 2014-11-19 19:55:55 +0000 |
| commit | e0c580a3362043666187d57f798e0537e94eea9b (patch) | |
| tree | 8f1fdfd6626d9d6117a47f24cbc8cb80c6282cb4 | |
| parent | 789372dba2f12bde4e04c7eee9cbd07b29b3a951 (diff) | |
| download | packages_apps_InCallUI-shipping/cm-11.0.tar.gz packages_apps_InCallUI-shipping/cm-11.0.tar.bz2 packages_apps_InCallUI-shipping/cm-11.0.zip | |
InCallUI: Validate function return value to avoid NPEcm-11.0-XNPH05Q-tomato-9828f8e9ccstable/cm-11.0-XNF8Yshipping/cm-11.0
Change-Id: I265860937d9489ef52934be759637a868349a23e
(cherry picked from commit 70be315247d92cc8f30d0e9e7a984a0e52cd233a)
| -rw-r--r-- | src/com/android/incallui/ConferenceManagerPresenter.java | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/com/android/incallui/ConferenceManagerPresenter.java b/src/com/android/incallui/ConferenceManagerPresenter.java index 0535bda1..8a5451a1 100644 --- a/src/com/android/incallui/ConferenceManagerPresenter.java +++ b/src/com/android/incallui/ConferenceManagerPresenter.java @@ -90,6 +90,11 @@ public class ConferenceManagerPresenter private void initParticipantList(CallList callList) { mParticipantList = null; Call call = callList.getActiveOrBackgroundCall(); + // getActiveOrBackgroundCall will return null if there are no calls + if (call == null) { + mNumCallersInConference = 0; + return; + } if (isImsCall(call)) { String[] confParticipantList = call.getCallDetails().getConfParticipantList(); |