commit edc625f52e5db5d0cb3d60387218f8f8365167f7
author Andrew Lee <anwlee@google.com> Tue Apr 14 13:38:12 2015 -0700
committer Andrew Lee <anwlee@google.com> Wed Apr 15 11:05:19 2015 -0700
tree 57a53cc0c46e7e7d519c187581dd29967b29a3d3
parent 6b91ebf58c928987ead635bb1c49a16965d4c835

Add StatusHints to Conference object.

+ Consolidated ParcelableConference constructors; only one is used.

Bug: 20181703
Change-Id: Iad49f10404e1c1eedc4ef68525bde0f10a8dfc97

telecomm/java/android/telecom/ConnectionService.java

diff --git a/telecomm/java/android/telecom/ConnectionService.java b/telecomm/java/android/telecom/ConnectionService.java
index dfdc3e1..6ec3fa3 100644
--- a/telecomm/java/android/telecom/ConnectionService.java
+++ b/telecomm/java/android/telecom/ConnectionService.java
@@ -415,6 +415,12 @@
                     Connection.capabilitiesToString(connectionCapabilities));
             mAdapter.setConnectionCapabilities(id, connectionCapabilities);
         }
+
+        @Override
+        public void onStatusHintsChanged(Conference conference, StatusHints statusHints) {
+            String id = mIdByConference.get(conference);
+            mAdapter.setStatusHints(id, statusHints);
+        }
     };
 
     private final Connection.Listener mConnectionListener = new Connection.Listener() {
@@ -884,7 +890,8 @@
                     conference.getState(),
                     conference.getConnectionCapabilities(),
                     connectionIds,
-                    conference.getConnectTimeMillis());
+                    conference.getConnectTimeMillis(),
+                    conference.getStatusHints());
             mAdapter.addConferenceCall(id, parcelableConference);
 
             // Go through any child calls and set the parent.