5 files changed, 6 insertions, 4 deletions
diff --git a/api/current.txt b/api/current.txt
index 922ba423a769..2f6350905244 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -30429,6 +30429,7 @@ package android.telecom {
   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);
diff --git a/api/system-current.txt b/api/system-current.txt
index 82a696fad2ce..5c24e8e3950a 100644
--- a/api/system-current.txt
+++ b/api/system-current.txt
@@ -32543,6 +32543,7 @@ package android.telecom {
   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);
diff --git a/telecomm/java/android/telecom/InCallService.java b/telecomm/java/android/telecom/InCallService.java
index 1cdddd44b254..e5d6ae011a1a 100644
--- a/telecomm/java/android/telecom/InCallService.java
+++ b/telecomm/java/android/telecom/InCallService.java
@@ -372,7 +372,7 @@ public abstract class InCallService extends Service {
         /**
          * 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.
diff --git a/telecomm/java/android/telecom/Phone.java b/telecomm/java/android/telecom/Phone.java
index 9f47898e7136..3d9acda688c8 100644
--- a/telecomm/java/android/telecom/Phone.java
+++ b/telecomm/java/android/telecom/Phone.java
@@ -125,7 +125,7 @@ public final class Phone {
 
         InCallService.VideoCall videoCall = call.getVideoCall();
         if (videoCall != null) {
-            videoCall.removeVideoCallListener();
+            videoCall.unregisterCallback();
         }
         fireCallRemoved(call);
     }
@@ -174,7 +174,7 @@ public final class Phone {
         for (Call call : mCalls) {
             InCallService.VideoCall videoCall = call.getVideoCall();
             if (videoCall != null) {
-                videoCall.removeVideoCallListener();
+                videoCall.unregisterCallback();
             }
             if (call.getState() != Call.STATE_DISCONNECTED) {
                 call.internalSetDisconnected();
diff --git a/telecomm/java/android/telecom/VideoCallImpl.java b/telecomm/java/android/telecom/VideoCallImpl.java
index d1474fac746e..3779d1aeca01 100644
--- a/telecomm/java/android/telecom/VideoCallImpl.java
+++ b/telecomm/java/android/telecom/VideoCallImpl.java
@@ -175,7 +175,7 @@ public class VideoCallImpl extends VideoCall {
     }
 
     /** {@inheritDoc} */
-    public void removeVideoCallListener() {
+    public void unregisterCallback() {
         mCallback = null;
         try {
             mVideoProvider.removeVideoCallback(mBinder);