diff options
author | Tyler Gunn <tgunn@google.com> | 2015-04-27 13:13:32 -0700 |
---|---|---|
committer | Tyler Gunn <tgunn@google.com> | 2015-04-27 13:13:32 -0700 |
commit | d7017c42be527ac7cbf5de6bc0ba56c676543e52 (patch) | |
tree | 02394db428f6616770851e94353727e2b1e81840 | |
parent | bde0b1e4c8672133e346d964f946d435da8f4d22 (diff) | |
download | frameworks_base-d7017c42be527ac7cbf5de6bc0ba56c676543e52.zip frameworks_base-d7017c42be527ac7cbf5de6bc0ba56c676543e52.tar.gz frameworks_base-d7017c42be527ac7cbf5de6bc0ba56c676543e52.tar.bz2 |
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
-rw-r--r-- | telecomm/java/android/telecom/ParcelableConference.java | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/telecomm/java/android/telecom/ParcelableConference.java b/telecomm/java/android/telecom/ParcelableConference.java index e54e79d..3d0c558 100644 --- a/telecomm/java/android/telecom/ParcelableConference.java +++ b/telecomm/java/android/telecom/ParcelableConference.java @@ -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); |