commit ffa4a812f88effeaf293643601a9f2b8e18c517d
author Hall Liu <hallliu@google.com> Thu Mar 02 16:11:00 2017 -0800
committer Hall Liu <hallliu@google.com> Thu Mar 30 13:49:12 2017 -0700
tree 636bb9d1fe68bf3cf46f87cb41784d55f88f2e2a
parent 4a8953094f89b4dc15567c019b2e75958ab00979

Add @TestApi annotations to CS-side RTT APIs for CTS

CTS tests need both the in-call and connection service sides of the APIs
to test Telecom functionality properly, so annotating the hidden-for-now
connection service APIs with TestApi.

Test: part of CTS
Change-Id: I3711729d7e8c8aff2735f4da9fbd04bcca6b4942

telecomm/java/android/telecom/ConnectionService.java

diff --git a/telecomm/java/android/telecom/ConnectionService.java b/telecomm/java/android/telecom/ConnectionService.java
index bf8f8e4..7401dda 100644
--- a/telecomm/java/android/telecom/ConnectionService.java
+++ b/telecomm/java/android/telecom/ConnectionService.java
@@ -1603,6 +1603,7 @@
         Log.d(this, "stopRtt(%s)", callId);
         if (mConnectionById.containsKey(callId)) {
             findConnectionForAction(callId, "stopRtt").onStopRtt();
+            findConnectionForAction(callId, "stopRtt").unsetRttProperty();
         } else if (mConferenceById.containsKey(callId)) {
             Log.w(this, "stopRtt called on a conference.");
         }