3 files changed, 18 insertions, 21 deletions
diff --git a/telecomm/java/com/android/internal/telecomm/IConnectionServiceAdapter.aidl b/telecomm/java/com/android/internal/telecomm/IConnectionServiceAdapter.aidl
index 552993f..60b5e1e 100644
--- a/telecomm/java/com/android/internal/telecomm/IConnectionServiceAdapter.aidl
+++ b/telecomm/java/com/android/internal/telecomm/IConnectionServiceAdapter.aidl
@@ -22,7 +22,7 @@ import android.telecomm.ConnectionRequest;
 import android.telecomm.ParcelableConnection;
 import android.telecomm.StatusHints;
 
-import com.android.internal.telecomm.ICallVideoProvider;
+import com.android.internal.telecomm.IVideoCallProvider;
 import com.android.internal.telecomm.RemoteServiceCallback;
 
 /**
@@ -65,7 +65,7 @@ oneway interface IConnectionServiceAdapter {
 
     void queryRemoteConnectionServices(RemoteServiceCallback callback);
 
-    void setCallVideoProvider(String callId, ICallVideoProvider callVideoProvider);
+    void setVideoCallProvider(String callId, IVideoCallProvider videoCallProvider);
 
     void setVideoState(String callId, int videoState);
 
diff --git a/telecomm/java/com/android/internal/telecomm/ICallVideoClient.aidl b/telecomm/java/com/android/internal/telecomm/IVideoCallCallback.aidl
index 2689561..a71ab0a 100644
--- a/telecomm/java/com/android/internal/telecomm/ICallVideoClient.aidl
+++ b/telecomm/java/com/android/internal/telecomm/IVideoCallCallback.aidl
@@ -20,25 +20,24 @@ import android.telecomm.CallCameraCapabilities;
 import android.telecomm.VideoCallProfile;
 
  /**
-  * Internal definition of the CallVideoClient, used for an InCall-UI to respond to video telephony
-  * related changes.
+  * Internal definition of the a callback interface, used for an InCallUi to respond to video
+  * telephony changes.
   *
-  * @see android.telecomm.CallVideoClient
+  * @see android.telecomm.InCallService.VideoCall.Listener
   *
   * {@hide}
   */
- oneway interface ICallVideoClient {
+oneway interface IVideoCallCallback {
+    void receiveSessionModifyRequest(in VideoCallProfile videoCallProfile);
 
-     void receiveSessionModifyRequest(in VideoCallProfile videoCallProfile);
+    void receiveSessionModifyResponse(int status, in VideoCallProfile requestedProfile,
+        in VideoCallProfile responseProfile);
 
-     void receiveSessionModifyResponse(int status, in VideoCallProfile requestedProfile,
-            in VideoCallProfile responseProfile);
+    void handleCallSessionEvent(int event);
 
-     void handleCallSessionEvent(int event);
+    void changePeerDimensions(int width, int height);
 
-     void updatePeerDimensions(int width, int height);
+    void changeCallDataUsage(int dataUsage);
 
-     void updateCallDataUsage(int dataUsage);
-
-     void handleCameraCapabilitiesChange(in CallCameraCapabilities callCameraCapabilities);
- }
+    void changeCameraCapabilities(in CallCameraCapabilities callCameraCapabilities);
+}
diff --git a/telecomm/java/com/android/internal/telecomm/ICallVideoProvider.aidl b/telecomm/java/com/android/internal/telecomm/IVideoCallProvider.aidl
index 860a431..c1ba749 100644
--- a/telecomm/java/com/android/internal/telecomm/ICallVideoProvider.aidl
+++ b/telecomm/java/com/android/internal/telecomm/IVideoCallProvider.aidl
@@ -19,15 +19,13 @@ package com.android.internal.telecomm;
 import android.view.Surface;
 import android.telecomm.VideoCallProfile;
 
-import com.android.internal.telecomm.ICallVideoClient;
-
 /**
- * Internal remote interface for a call video provider.
- * @see android.telecomm.CallVideoProvider
+ * Internal remote interface for a video call provider.
+ * @see android.telecomm.VideoCallProvider
  * @hide
  */
-oneway interface ICallVideoProvider {
-    void setCallVideoClient(IBinder callVideoClient);
+oneway interface IVideoCallProvider {
+    void setVideoCallListener(IBinder videoCallListenerBinder);
 
     void setCamera(String cameraId);