diff options
author | Tyler Gunn <tgunn@google.com> | 2016-08-23 21:05:25 -0700 |
---|---|---|
committer | Tyler Gunn <tgunn@google.com> | 2016-08-23 21:05:55 -0700 |
commit | 108a6b728367e8e68b00cc120759ce7651cc7671 (patch) | |
tree | c8c96a22de9912e943d188d7a3bdb2f0bf457791 | |
parent | 3a3d8ebcc536dea3fbda0b27ac257523a0a0f8a7 (diff) | |
download | ims-108a6b728367e8e68b00cc120759ce7651cc7671.tar.gz |
Fix potential error copying null conference participant list.
In some cases, mConferenceParticipants can be null, causing the copy
code to crash the com.android.phone app.
Adding appropriate null/empty checks to prevent this.
Bug: 31044679
Change-Id: I9ee464281af8213c03705d054500b8c5e2f12f05
-rw-r--r-- | src/java/com/android/ims/ImsCall.java | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/java/com/android/ims/ImsCall.java b/src/java/com/android/ims/ImsCall.java index b6590f89..6812b04f 100644 --- a/src/java/com/android/ims/ImsCall.java +++ b/src/java/com/android/ims/ImsCall.java @@ -731,6 +731,12 @@ public class ImsCall implements ICall { synchronized(mLockObj) { logi("getConferenceParticipants :: mConferenceParticipants" + mConferenceParticipants); + if (mConferenceParticipants == null) { + return null; + } + if (mConferenceParticipants.isEmpty()) { + return new ArrayList<ConferenceParticipant>(0); + } return new ArrayList<ConferenceParticipant>(mConferenceParticipants); } } |