Remove deprecated VideoCallListener methods.

These shouldn't be needed because the video call APIs were never
previously made public.

Bug: 20160491
Change-Id: Ic9c5d0d1e8618bfe61f8905d4afaeaa37f51c915
diff --git a/api/current.txt b/api/current.txt
index 326ad86..14b40c4 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -30309,7 +30309,6 @@
     method public abstract void setDisplaySurface(android.view.Surface);
     method public abstract void setPauseImage(java.lang.String);
     method public abstract void setPreviewSurface(android.view.Surface);
-    method public deprecated void setVideoCallListener(android.telecom.InCallService.VideoCall.Listener);
     method public abstract void setZoom(float);
   }
 
@@ -30324,10 +30323,6 @@
     method public abstract void onVideoQualityChanged(int);
   }
 
-  public static abstract deprecated class InCallService.VideoCall.Listener extends android.telecom.InCallService.VideoCall.Callback {
-    ctor public InCallService.VideoCall.Listener();
-  }
-
   public class PhoneAccount implements android.os.Parcelable {
     method public static android.telecom.PhoneAccount.Builder builder(android.telecom.PhoneAccountHandle, java.lang.CharSequence);
     method public android.graphics.drawable.Drawable createIconDrawable(android.content.Context);
diff --git a/api/system-current.txt b/api/system-current.txt
index bd7e5a8..a1b33fc 100644
--- a/api/system-current.txt
+++ b/api/system-current.txt
@@ -32418,7 +32418,6 @@
     method public abstract void setDisplaySurface(android.view.Surface);
     method public abstract void setPauseImage(java.lang.String);
     method public abstract void setPreviewSurface(android.view.Surface);
-    method public deprecated void setVideoCallListener(android.telecom.InCallService.VideoCall.Listener);
     method public abstract void setZoom(float);
   }
 
@@ -32433,10 +32432,6 @@
     method public abstract void onVideoQualityChanged(int);
   }
 
-  public static abstract deprecated class InCallService.VideoCall.Listener extends android.telecom.InCallService.VideoCall.Callback {
-    ctor public InCallService.VideoCall.Listener();
-  }
-
   public final deprecated class Phone {
     method public final void addListener(android.telecom.Phone.Listener);
     method public final boolean canAddCall();
diff --git a/telecomm/java/android/telecom/InCallService.java b/telecomm/java/android/telecom/InCallService.java
index 9dbe455..7cbc0fc 100644
--- a/telecomm/java/android/telecom/InCallService.java
+++ b/telecomm/java/android/telecom/InCallService.java
@@ -370,14 +370,6 @@
         public abstract void registerCallback(VideoCall.Callback callback);
 
         /**
-         * @deprecated Use {@code VideoCall#registerCallback} instead.
-         */
-        @Deprecated
-        public void setVideoCallListener(VideoCall.Listener videoCallListener) {
-            registerCallback(videoCallListener);
-        }
-
-        /**
          * Sets the camera to be used for video recording in a video call.
          *
          * @param cameraId The id of the camera.
@@ -540,11 +532,5 @@
              */
             public abstract void onCameraCapabilitiesChanged(CameraCapabilities cameraCapabilities);
         }
-
-        /**
-         * @deprecated Use {@code VideoCall.Callback} instead.
-         */
-        @Deprecated
-        public static abstract class Listener extends Callback { }
     }
 }