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/Call.java

diff --git a/src/com/android/telecomm/Call.java b/src/com/android/telecomm/Call.java
index b434ac3..d76e314 100644
--- a/src/com/android/telecomm/Call.java
+++ b/src/com/android/telecomm/Call.java
@@ -35,7 +35,7 @@
 import android.telephony.PhoneNumberUtils;
 import android.text.TextUtils;
 
-import com.android.internal.telecomm.ICallVideoProvider;
+import com.android.internal.telecomm.IVideoCallProvider;
 import com.android.internal.telephony.CallerInfo;
 import com.android.internal.telephony.CallerInfoAsyncQuery;
 import com.android.internal.telephony.CallerInfoAsyncQuery.OnQueryCompleteListener;
@@ -74,7 +74,7 @@
         void onParentChanged(Call call);
         void onChildrenChanged(Call call);
         void onCannedSmsResponsesLoaded(Call call);
-        void onCallVideoProviderChanged(Call call);
+        void onVideoCallProviderChanged(Call call);
         void onCallerInfoChanged(Call call);
         void onAudioModeIsVoipChanged(Call call);
         void onStatusHintsChanged(Call call);
@@ -113,7 +113,7 @@
         @Override
         public void onCannedSmsResponsesLoaded(Call call) {}
         @Override
-        public void onCallVideoProviderChanged(Call call) {}
+        public void onVideoCallProviderChanged(Call call) {}
         @Override
         public void onCallerInfoChanged(Call call) {}
         @Override
@@ -260,7 +260,7 @@
     /** Whether an attempt has been made to load the text message responses. */
     private boolean mCannedSmsResponsesLoadingStarted = false;
 
-    private ICallVideoProvider mCallVideoProvider;
+    private IVideoCallProvider mVideoCallProvider;
 
     private boolean mAudioModeIsVoip;
     private StatusHints mStatusHints;
@@ -577,7 +577,8 @@
         setHandle(connection.getHandle(), connection.getHandlePresentation());
         setCallerDisplayName(
                 connection.getCallerDisplayName(), connection.getCallerDisplayNamePresentation());
-        setCallVideoProvider(connection.getCallVideoProvider());
+
+        setVideoCallProvider(connection.getVideoCallProvider());
         setVideoState(connection.getVideoState());
 
         if (mIsIncoming) {
@@ -1060,20 +1061,20 @@
     }
 
     /**
-     * Sets a call video provider for the call.
+     * Sets a video call provider for the call.
      */
-    public void setCallVideoProvider(ICallVideoProvider callVideoProvider) {
-        mCallVideoProvider = callVideoProvider;
+    public void setVideoCallProvider(IVideoCallProvider videoCallProvider) {
+        mVideoCallProvider = videoCallProvider;
         for (Listener l : mListeners) {
-            l.onCallVideoProviderChanged(Call.this);
+            l.onVideoCallProviderChanged(Call.this);
         }
     }
 
     /**
-     * @return Return the call video Provider binder.
+     * @return Return the {@link VideoCallProvider} binder.
      */
-    public ICallVideoProvider getCallVideoProvider() {
-        return mCallVideoProvider;
+    public IVideoCallProvider getVideoCallProvider() {
+        return mVideoCallProvider;
     }
 
     /**