summaryrefslogtreecommitdiff
path: root/telecomm/java/android/telecom/VideoCallImpl.java
diff options
context:
space:
mode:
authorYorke Lee <yorkelee@google.com>2015-05-12 13:31:25 -0700
committerYorke Lee <yorkelee@google.com>2015-05-14 12:31:19 -0700
commit56acbc410093b9854060c3a32c68a60d95cdca85 (patch)
treeabbad361fa27423a0754bcaf3432c655f9b72637 /telecomm/java/android/telecom/VideoCallImpl.java
parent6d3a7575e102e44514c1f834bd497f6b26e96769 (diff)
DO NOT MERGE Fixes for APi review
Move CameraCapabilities into VideoProfile Make PhoneAccount and PhoneAccountHandle final Bug: 21040387 Bug: 21066505 Change-Id: I72453c89ae3765f9b9cf263938fce96d5978d2e0
Diffstat (limited to 'telecomm/java/android/telecom/VideoCallImpl.java')
-rw-r--r--telecomm/java/android/telecom/VideoCallImpl.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/telecomm/java/android/telecom/VideoCallImpl.java b/telecomm/java/android/telecom/VideoCallImpl.java
index 61341cd1ed25..3d77f9b63cd7 100644
--- a/telecomm/java/android/telecom/VideoCallImpl.java
+++ b/telecomm/java/android/telecom/VideoCallImpl.java
@@ -99,7 +99,7 @@ public class VideoCallImpl extends VideoCall {
}
@Override
- public void changeCameraCapabilities(CameraCapabilities cameraCapabilities) {
+ public void changeCameraCapabilities(VideoProfile.CameraCapabilities cameraCapabilities) {
mHandler.obtainMessage(MessageHandler.MSG_CHANGE_CAMERA_CAPABILITIES,
cameraCapabilities).sendToTarget();
}
@@ -161,7 +161,7 @@ public class VideoCallImpl extends VideoCall {
break;
case MSG_CHANGE_CAMERA_CAPABILITIES:
mCallback.onCameraCapabilitiesChanged(
- (CameraCapabilities) msg.obj);
+ (VideoProfile.CameraCapabilities) msg.obj);
break;
case MSG_CHANGE_VIDEO_QUALITY:
mVideoQuality = msg.arg1;