Merge QP1A.180823.001

Change-Id: Ia2d6fa811b3c57185c1975db603d59e6eaef73fc

1 files changed, 4 insertions, 2 deletions

diff --git a/telecomm/java/android/telecom/ConnectionService.java b/telecomm/java/android/telecom/ConnectionService.java
index bc9c8473943b..92ba4ec9cd93 100644
--- a/telecomm/java/android/telecom/ConnectionService.java
+++ b/telecomm/java/android/telecom/ConnectionService.java
@@ -1496,9 +1496,11 @@ public abstract class ConnectionService extends Service {
             }
         }
 
-        public void onCdmaConnectionTimeReset(Connection c) {
+        public void onConnectionTimeReset(Connection c) {
             String id = mIdByConnection.get(c);
-            mAdapter.resetCdmaConnectionTime(id);
+            if (id != null) {
+                mAdapter.resetConnectionTime(id);
+            }
         }
     };