diff options
author | Andrew Lee <anwlee@google.com> | 2014-06-30 12:47:36 -0700 |
---|---|---|
committer | Andrew Lee <anwlee@google.com> | 2014-07-01 13:20:36 -0700 |
commit | 780800d53bb68f0565c1cf3e827a870c4e0e6db7 (patch) | |
tree | 94b81a1d42f8210ccafbeb72cdfe217d25d87c8a /InCallUI | |
parent | 7595f071631437e2ca1271aaae616c0f6e1f3b9f (diff) |
Instantiate and set CallVideoClient on the CallVideoProvider.
Also, propagated naming changes to InCall's implementation of
VideoCallClient.
Bug: 15893156
Change-Id: If0780c52c06f2a8c7f0d64ad8bd92824d1bd5d83
Diffstat (limited to 'InCallUI')
-rw-r--r-- | InCallUI/src/com/android/incallui/Call.java | 13 | ||||
-rw-r--r-- | InCallUI/src/com/android/incallui/InCallVideoClient.java | 6 |
2 files changed, 16 insertions, 3 deletions
diff --git a/InCallUI/src/com/android/incallui/Call.java b/InCallUI/src/com/android/incallui/Call.java index 7cee04d64..c0e5fd06b 100644 --- a/InCallUI/src/com/android/incallui/Call.java +++ b/InCallUI/src/com/android/incallui/Call.java @@ -17,6 +17,7 @@ package com.android.incallui; import android.net.Uri; +import android.os.RemoteException; import android.telecomm.CallCapabilities; import android.telecomm.CallNumberPresentation; import android.telecomm.CallServiceDescriptor; @@ -115,6 +116,8 @@ public final class Call { private String mParentCallId; private List<String> mChildCallIds; + private InCallVideoClient mCallVideoClient; + public Call(String callId) { mCallId = callId; } @@ -253,6 +256,16 @@ public final class Call { public void setCallVideoProvider(RemoteCallVideoProvider callVideoProvider) { mCallVideoProvider = callVideoProvider; + + if (mCallVideoProvider != null) { + try { + if (mCallVideoClient == null) { + mCallVideoClient = new InCallVideoClient(); + } + mCallVideoProvider.setCallVideoClient(mCallVideoClient); + } catch (RemoteException ignored) { + } + } } public void setChildCallIds(List<String> callIds) { diff --git a/InCallUI/src/com/android/incallui/InCallVideoClient.java b/InCallUI/src/com/android/incallui/InCallVideoClient.java index 6763672ba..097054dbf 100644 --- a/InCallUI/src/com/android/incallui/InCallVideoClient.java +++ b/InCallUI/src/com/android/incallui/InCallVideoClient.java @@ -36,12 +36,12 @@ public class InCallVideoClient extends CallVideoClient { } @Override - public void onCallSessionEvent(int event) { + public void onHandleCallSessionEvent(int event) { } @Override - public void onUpdatedPeerDimensions(int width, int height) { + public void onUpdatePeerDimensions(int width, int height) { } @@ -51,7 +51,7 @@ public class InCallVideoClient extends CallVideoClient { } @Override - public void onCameraCapabilitiesChange(CallCameraCapabilities callCameraCapabilities) { + public void onHandleCameraCapabilitiesChange(CallCameraCapabilities callCameraCapabilities) { } } |