commit 0055ccfd04f89bf2622ea2aa91eae6951db85bd3
author gitbuildkicker <android-build@google.com> Thu Aug 25 00:06:35 2016 -0700
committer gitbuildkicker <android-build@google.com> Thu Aug 25 00:06:35 2016 -0700
tree c8c96a22de9912e943d188d7a3bdb2f0bf457791
parent 108a6b728367e8e68b00cc120759ce7651cc7671
parent f80a3a643a1c2c77efe7d2fbb855c0aa93f512d2

merge in nyc-mr1-release history after reset to nyc-mr1-dev

src/java/com/android/ims/ImsCall.java

diff --git a/src/java/com/android/ims/ImsCall.java b/src/java/com/android/ims/ImsCall.java
index b6590f8..6812b04 100644
--- a/src/java/com/android/ims/ImsCall.java
+++ b/src/java/com/android/ims/ImsCall.java
@@ -731,6 +731,12 @@
         synchronized(mLockObj) {
             logi("getConferenceParticipants :: mConferenceParticipants"
                     + mConferenceParticipants);
+            if (mConferenceParticipants == null) {
+                return null;
+            }
+            if (mConferenceParticipants.isEmpty()) {
+                return new ArrayList<ConferenceParticipant>(0);
+            }
             return new ArrayList<ConferenceParticipant>(mConferenceParticipants);
         }
     }