commit 3bcf935b25470e94c8c6855862434d15b785c54a
author Andrew Lee <anwlee@google.com> Wed Jul 23 12:36:05 2014 -0700
committer Andrew Lee <anwlee@google.com> Fri Jul 25 08:55:45 2014 -0700
tree 0d53c259109d4481347523d816c6f35c7acc8433
parent 7cdb909a2f5436db2fa03636851c72c42539bc65

Update Telecomm with VideoCall.Listener changes.

Bug: 16494880
Bug: 16495203
Change-Id: I2331e8316f068ecba0dbea30647ec95da9e37f59

src/com/android/telecomm/ConnectionServiceWrapper.java

diff --git a/src/com/android/telecomm/ConnectionServiceWrapper.java b/src/com/android/telecomm/ConnectionServiceWrapper.java
index a78f928..b2a2bf0 100644
--- a/src/com/android/telecomm/ConnectionServiceWrapper.java
+++ b/src/com/android/telecomm/ConnectionServiceWrapper.java
@@ -33,9 +33,9 @@
 import android.telephony.DisconnectCause;
 
 import com.android.internal.os.SomeArgs;
-import com.android.internal.telecomm.ICallVideoProvider;
 import com.android.internal.telecomm.IConnectionService;
 import com.android.internal.telecomm.IConnectionServiceAdapter;
+import com.android.internal.telecomm.IVideoCallProvider;
 import com.android.internal.telecomm.RemoteServiceCallback;
 import com.google.common.base.Preconditions;
 
@@ -250,9 +250,9 @@
                     SomeArgs args = (SomeArgs) msg.obj;
                     try {
                         call = mCallIdMapper.getCall(args.arg1);
-                        ICallVideoProvider callVideoProvider = (ICallVideoProvider) args.arg2;
+                        IVideoCallProvider videoCallProvider = (IVideoCallProvider) args.arg2;
                         if (call != null) {
-                            call.setCallVideoProvider(callVideoProvider);
+                            call.setVideoCallProvider(videoCallProvider);
                         }
                     } finally {
                         args.recycle();
@@ -373,12 +373,12 @@
         }
 
         @Override
-        public void setCallVideoProvider(String callId, ICallVideoProvider callVideoProvider) {
-            logIncoming("setCallVideoProvider %s", callId);
+        public void setVideoCallProvider(String callId, IVideoCallProvider videoCallProvider) {
+            logIncoming("setVideoCallProvider %s", callId);
             mCallIdMapper.checkValidCallId(callId);
             SomeArgs args = SomeArgs.obtain();
             args.arg1 = callId;
-            args.arg2 = callVideoProvider;
+            args.arg2 = videoCallProvider;
             mHandler.obtainMessage(MSG_SET_CALL_VIDEO_PROVIDER, args).sendToTarget();
         }