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

Commit d7017c42 authored by Tyler Gunn's avatar Tyler Gunn
Browse files

Fixing issue where conference calls enable speaker phone. 

- The issue was due to a mis-merge in ParcelableConference.  The write
of the status hints happens at the end of the writeToParcel method.

Bug: 20503132
Change-Id: I40ef9b267b48876006e4cbe29e5ae09ba77bcb33
parent bde0b1e4

telecomm/java/android/telecom/ParcelableConference.java

+1 −2
Original line number Diff line number Diff line
@@ -121,11 +121,10 @@ public final class ParcelableConference implements Parcelable { 
            List<String> connectionIds = new ArrayList<>(2);

            source.readList(connectionIds, classLoader);

            long connectTimeMillis = source.readLong();

            StatusHints statusHints = source.readParcelable(classLoader);



            IVideoProvider videoCallProvider =

                    IVideoProvider.Stub.asInterface(source.readStrongBinder());

            int videoState = source.readInt();

            StatusHints statusHints = source.readParcelable(classLoader);



            return new ParcelableConference(phoneAccount, state, capabilities, connectionIds,

                    videoCallProvider, videoState, connectTimeMillis, statusHints);