commit 1418054108e3811db80e28496b335514b51b10f4
author Etan Cohen <etancohen@google.com> Fri Apr 24 15:16:10 2015 -0700
committer Etan Cohen <etancohen@google.com> Fri Apr 24 15:22:03 2015 -0700
tree 0d79e25847ae0dc681b36014ce6fe64c89c5be93
parent fd840dd60328d2ad6e30dd438c7429670ce82ec3

Rename removeVideoCallListener to unregisterCallback

Change-Id: Ie6b5ac9131e81900efc7d3fa67056aa47d566a44

api/current.txt

diff --git a/api/current.txt b/api/current.txt
index 922ba42..2f63509 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -30429,6 +30429,7 @@
   public static abstract class InCallService.VideoCall {
     ctor public InCallService.VideoCall();
     method public abstract void registerCallback(android.telecom.InCallService.VideoCall.Callback);
+    method public abstract void unregisterCallback();
     method public abstract void requestCallDataUsage();
     method public abstract void requestCameraCapabilities();
     method public abstract void sendSessionModifyRequest(android.telecom.VideoProfile);

api/system-current.txt

diff --git a/api/system-current.txt b/api/system-current.txt
index 82a696f..5c24e8e 100644
--- a/api/system-current.txt
+++ b/api/system-current.txt
@@ -32543,6 +32543,7 @@
   public static abstract class InCallService.VideoCall {
     ctor public InCallService.VideoCall();
     method public abstract void registerCallback(android.telecom.InCallService.VideoCall.Callback);
+    method public abstract void unregisterCallback();
     method public abstract void requestCallDataUsage();
     method public abstract void requestCameraCapabilities();
     method public abstract void sendSessionModifyRequest(android.telecom.VideoProfile);

telecomm/java/android/telecom/InCallService.java

diff --git a/telecomm/java/android/telecom/InCallService.java b/telecomm/java/android/telecom/InCallService.java
index 1cdddd4..e5d6ae0 100644
--- a/telecomm/java/android/telecom/InCallService.java
+++ b/telecomm/java/android/telecom/InCallService.java
@@ -372,7 +372,7 @@
         /**
          * Clears the video call listener set via {@link #setVideoCallListener(Listener)}.
          */
-        public abstract void removeVideoCallListener();
+        public abstract void unregisterCallback();
 
         /**
          * Sets the camera to be used for video recording in a video call.

telecomm/java/android/telecom/Phone.java

diff --git a/telecomm/java/android/telecom/Phone.java b/telecomm/java/android/telecom/Phone.java
index 9f47898..3d9acda 100644
--- a/telecomm/java/android/telecom/Phone.java
+++ b/telecomm/java/android/telecom/Phone.java
@@ -125,7 +125,7 @@
 
         InCallService.VideoCall videoCall = call.getVideoCall();
         if (videoCall != null) {
-            videoCall.removeVideoCallListener();
+            videoCall.unregisterCallback();
         }
         fireCallRemoved(call);
     }
@@ -174,7 +174,7 @@
         for (Call call : mCalls) {
             InCallService.VideoCall videoCall = call.getVideoCall();
             if (videoCall != null) {
-                videoCall.removeVideoCallListener();
+                videoCall.unregisterCallback();
             }
             if (call.getState() != Call.STATE_DISCONNECTED) {
                 call.internalSetDisconnected();

telecomm/java/android/telecom/VideoCallImpl.java

diff --git a/telecomm/java/android/telecom/VideoCallImpl.java b/telecomm/java/android/telecom/VideoCallImpl.java
index d1474fa..3779d1a 100644
--- a/telecomm/java/android/telecom/VideoCallImpl.java
+++ b/telecomm/java/android/telecom/VideoCallImpl.java
@@ -175,7 +175,7 @@
     }
 
     /** {@inheritDoc} */
-    public void removeVideoCallListener() {
+    public void unregisterCallback() {
         mCallback = null;
         try {
             mVideoProvider.removeVideoCallback(mBinder);