commit bd7d3791552312e605c073bf1adb6548a6371eb9
author Hall Liu <hallliu@google.com> Fri Jan 29 18:38:43 2016 -0800
committer Hall Liu <hallliu@google.com> Fri Jan 29 18:38:43 2016 -0800
tree f4485e9c03a28c4ceeca0a01a8fbe25e62d6063b
parent 840928552a07a649dd5ded64e8beaaf1107b1f1d

Predictable ordering for sending calls to InCallService

Always order calls sent to an InCallService such that children are sent
before parents when there is a conference call going on.

Bug: 26818778
Change-Id: If42c10963c2d0c7f43498ef40d647781a0179dc2

src/com/android/server/telecom/InCallController.java

diff --git a/src/com/android/server/telecom/InCallController.java b/src/com/android/server/telecom/InCallController.java
index 4dde1ff..4789318 100644
--- a/src/com/android/server/telecom/InCallController.java
+++ b/src/com/android/server/telecom/InCallController.java
@@ -36,7 +36,6 @@
 import android.telecom.InCallService;
 import android.telecom.ParcelableCall;
 import android.telecom.TelecomManager;
-import android.telecom.VideoCallImpl;
 import android.text.TextUtils;
 import android.util.ArrayMap;
 
@@ -426,7 +425,7 @@
             Log.event(call, Log.Events.ERROR_LOG,
                     "InCallService system UI failed binding: " + inCallUIService);
         }
-        mInCallUIComponentName = inCallUIService;
+        mInCallUIComponentName = inCallUIServiceToBind;
 
         // Bind to the control InCallServices
         for (ComponentName componentName : nonUIInCallServices) {
@@ -572,7 +571,7 @@
         }
 
         // Upon successful connection, send the state of the world to the service.
-        Collection<Call> calls = mCallsManager.getCalls();
+        List<Call> calls = orderCallsWithChildrenFirst(mCallsManager.getCalls());
         if (!calls.isEmpty()) {
             Log.i(this, "Adding %s calls to InCallService after onConnected: %s", calls.size(),
                     componentName);
@@ -739,4 +738,18 @@
         return info.serviceInfo.metaData
                 .getBoolean(TelecomManager.METADATA_IN_CALL_SERVICE_RINGING, false);
     }
+
+    private List<Call> orderCallsWithChildrenFirst(Collection<Call> calls) {
+        LinkedList<Call> parentCalls = new LinkedList<>();
+        LinkedList<Call> childCalls = new LinkedList<>();
+        for (Call call : calls) {
+            if (call.getChildCalls().size() > 0) {
+                parentCalls.add(call);
+            } else {
+                childCalls.add(call);
+            }
+        }
+        childCalls.addAll(parentCalls);
+        return childCalls;
+    }
 }