Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ce8a6542 authored by Tyler Gunn's avatar Tyler Gunn Committed by android-build-merger
Browse files

Fix potential error copying null conference participant list. am: 108a6b72 

am: ef3d89d0

Change-Id: I2a615eca5d499be15e40ac6b8370aab3bcec444b
parents dc7432e5 ef3d89d0

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

+6 −0
Original line number Diff line number Diff line
@@ -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);

        }

    }