commit 72e3120c3a90d39d213b6ba8fc7cca1a26a20c55
author cqiang <cqiang@codeaurora.org> Mon Sep 14 17:04:19 2015 +0800
committer Linux Build Service Account <lnxbuild@localhost> Tue Oct 06 03:30:24 2015 -0600
tree 30c1b02cc2027db67062184d85beacfc358f6445
parent 52e4cc428815b6efb40d3351785940ce295f2ccf

Telecom: Reset the duration after the CDMA call is accepted

In android original design, the duration of CDMA MO call is started from
the dial command sent, so it is not the real duration of the active time.

In this patch, CallsManager receive a new message to
reset the connection time for this call.

CRs-Fixed: 754497

Change-Id: Ib90283a3b5bbc7e8fa1d1e7ef09342ac19302f9c

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

diff --git a/src/com/android/server/telecom/Call.java b/src/com/android/server/telecom/Call.java
index 7b933db..eb9e114 100644
--- a/src/com/android/server/telecom/Call.java
+++ b/src/com/android/server/telecom/Call.java
@@ -782,6 +782,10 @@
         return mConnectTimeMillis;
     }
 
+    public void setConnectTimeMillis(long connectTimeMillis) {
+        mConnectTimeMillis = connectTimeMillis;
+    }
+
     int getConnectionCapabilities() {
         return mConnectionCapabilities;
     }

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

diff --git a/src/com/android/server/telecom/CallsManager.java b/src/com/android/server/telecom/CallsManager.java
index e4531b7..69a4ab7 100644
--- a/src/com/android/server/telecom/CallsManager.java
+++ b/src/com/android/server/telecom/CallsManager.java
@@ -2280,4 +2280,14 @@
             removeFromLch.setLocalCallHold(false);
         }
     }
+
+    void resetCdmaConnectionTime(Call call) {
+        call.setConnectTimeMillis(System.currentTimeMillis());
+        if (mCalls.contains(call)) {
+            for (CallsManagerListener listener : mListeners) {
+                listener.onCallStateChanged(call, CallState.ACTIVE, CallState.ACTIVE);
+            }
+            updateForegroundCall();
+        }
+    }
 }

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

diff --git a/src/com/android/server/telecom/ConnectionServiceWrapper.java b/src/com/android/server/telecom/ConnectionServiceWrapper.java
index 674f3e7..dbdc234 100644
--- a/src/com/android/server/telecom/ConnectionServiceWrapper.java
+++ b/src/com/android/server/telecom/ConnectionServiceWrapper.java
@@ -122,6 +122,27 @@
         }
 
         @Override
+        public void resetCdmaConnectionTime(String callId) {
+            long token = Binder.clearCallingIdentity();
+            try {
+                synchronized (mLock) {
+                    logIncoming("resetCdmaConnectionTime %s", callId);
+                    if (mCallIdMapper.isValidCallId(callId) ||
+                            mCallIdMapper.isValidConferenceId(callId)) {
+                        Call call = mCallIdMapper.getCall(callId);
+                        if (call != null) {
+                            mCallsManager.resetCdmaConnectionTime(call);
+                        } else {
+                            // Log.w(this, "resetCdmaConnectionTime, unknown call id: %s", msg.obj);
+                        }
+                    }
+                }
+            } finally {
+                Binder.restoreCallingIdentity(token);
+            }
+        }
+
+        @Override
         public void setVideoProvider(String callId, IVideoProvider videoProvider) {
             long token = Binder.clearCallingIdentity();
             try {