commit 805917f7d6dfd87cad970cec9be55b24200db7b8
author Etan Cohen <etancohen@google.com> Fri Apr 24 14:41:11 2015 -0700
committer Etan Cohen <etancohen@google.com> Fri Apr 24 14:41:11 2015 -0700
tree 1e888c03e75b12589bf121784024eaf71ae600a0
parent bbd2c2093759d9596044245f613f35dce5d5bb88
parent 569b54e5dff12cc29aa253efb3c61bc4fc5d778e

Merge commit '569b54e' into merge2

tests/src/com/android/server/telecom/tests/ConnectionServiceFixture.java

diff --git a/tests/src/com/android/server/telecom/tests/ConnectionServiceFixture.java b/tests/src/com/android/server/telecom/tests/ConnectionServiceFixture.java
index 5114a52..a8841cd 100644
--- a/tests/src/com/android/server/telecom/tests/ConnectionServiceFixture.java
+++ b/tests/src/com/android/server/telecom/tests/ConnectionServiceFixture.java
@@ -88,6 +88,7 @@
         IVideoProvider videoProvider;
         int videoState;
         long connectTimeMillis;
+        StatusHints statusHints;
     }
 
     public String mLatestConnectionId;
@@ -335,7 +336,8 @@
                 c.connectionIds,
                 c.videoProvider,
                 c.videoState,
-                c.connectTimeMillis);
+                c.connectTimeMillis,
+                c.statusHints);
     }
 
     private ParcelableConnection parcelable(ConnectionInfo c) {