diff options
| author | Tyler Gunn <tgunn@google.com> | 2015-04-16 16:38:23 +0000 |
|---|---|---|
| committer | Android Partner Code Review <android-gerrit-partner@google.com> | 2015-04-16 16:38:23 +0000 |
| commit | 04b18ec15359b79b832ec50010f050d7298e7fb5 (patch) | |
| tree | 163dd641658d77b66955597dd919a706a0061c20 /telecomm | |
| parent | 75958420f2d294ceda517c2782b294002dc2969f (diff) | |
| parent | bd1f9ece87e842e09b9967f94858f9f5b9ee7268 (diff) | |
| download | frameworks_base-04b18ec15359b79b832ec50010f050d7298e7fb5.zip frameworks_base-04b18ec15359b79b832ec50010f050d7298e7fb5.tar.gz frameworks_base-04b18ec15359b79b832ec50010f050d7298e7fb5.tar.bz2 | |
Merge "Fix incorrect Conference time for IMS conference calls." into m-wireless-dev
Diffstat (limited to 'telecomm')
| -rw-r--r-- | telecomm/java/android/telecom/ParcelableConference.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/telecomm/java/android/telecom/ParcelableConference.java b/telecomm/java/android/telecom/ParcelableConference.java index ab82549..6a221e6 100644 --- a/telecomm/java/android/telecom/ParcelableConference.java +++ b/telecomm/java/android/telecom/ParcelableConference.java @@ -130,7 +130,7 @@ public final class ParcelableConference implements Parcelable { int videoState = source.readInt(); return new ParcelableConference(phoneAccount, state, capabilities, connectionIds, - videoCallProvider, videoState); + videoCallProvider, videoState, connectTimeMillis); } @Override |