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

Commit 79f17944 authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "Replace ParcelableCall with ConferenceParticipant in Mainline" am: 4f82ed36 am: 64aa630e 

Change-Id: I13aa05175f812ab96e10a5bf608d4292201a52ec
parents 95762594 64aa630e

src/java/com/android/ims/internal/ConferenceParticipant.java

+1 −1
Original line number Diff line number Diff line
@@ -108,7 +108,7 @@ public class ConferenceParticipant implements Parcelable { 


                @Override

                public ConferenceParticipant createFromParcel(Parcel source) {

                    ClassLoader classLoader = ParcelableCall.class.getClassLoader();

                    ClassLoader classLoader = ConferenceParticipant.class.getClassLoader();

                    Uri handle = source.readParcelable(classLoader);

                    String displayName = source.readString();

                    Uri endpoint = source.readParcelable(classLoader);