commit 0b765caeb3e5506eadce22ee138f133f8de5d72b
author Linux Build Service Account <lnxbuild@localhost> Wed Mar 25 08:30:47 2015 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Wed Mar 25 08:30:47 2015 -0700
tree fd8b2147a20bab2ec1142a7c15af60d8a459be06
parent 8ec954600e0d120aaf86532cccf44714b80e3597
parent 87d8324269aa3d5b713804a9c00d6e39f59fafe5

Merge "IMS: Fix timer reset during volte conference."

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 74af36e..c85c5c9 100755
--- a/src/com/android/server/telecom/InCallController.java
+++ b/src/com/android/server/telecom/InCallController.java
@@ -522,10 +522,7 @@
                 }
                 childCallIds.add(mCallIdMapper.getCallId(child));
             }
-
-            if (childConnectTimeMillis != Long.MAX_VALUE) {
-                connectTimeMillis = childConnectTimeMillis;
-            }
+            connectTimeMillis = Math.min(connectTimeMillis, childConnectTimeMillis);
         }
 
         if (call.isRespondViaSmsCapable()) {