From b71122cb8167e7eabb8413d74d1b764849914071 Mon Sep 17 00:00:00 2001
From: Yorke Lee <yorkelee@google.com>
Date: Tue, 12 May 2015 13:33:05 -0700
Subject: Fixes for APi review

Move CameraCapabilities into VideoProfile
Make PhoneAccount and PhoneAccountHandle final

Bug: 21040387
Bug: 21066505
Change-Id: I2c0eb2f3a20ada68ad5109363c4f7ff64c349776
---
 InCallUI/src/com/android/incallui/InCallVideoCallCallback.java | 2 +-
 InCallUI/src/com/android/incallui/VideoCallPresenter.java      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/InCallUI/src/com/android/incallui/InCallVideoCallCallback.java b/InCallUI/src/com/android/incallui/InCallVideoCallCallback.java
index ede1129cd..a35404a76 100644
--- a/InCallUI/src/com/android/incallui/InCallVideoCallCallback.java
+++ b/InCallUI/src/com/android/incallui/InCallVideoCallCallback.java
@@ -16,11 +16,11 @@
 
 package com.android.incallui;
 
-import android.telecom.CameraCapabilities;
 import android.telecom.Connection;
 import android.telecom.Connection.VideoProvider;
 import android.telecom.InCallService.VideoCall;
 import android.telecom.VideoProfile;
+import android.telecom.VideoProfile.CameraCapabilities;
 
 /**
  * Implements the InCallUI VideoCall Callback.
diff --git a/InCallUI/src/com/android/incallui/VideoCallPresenter.java b/InCallUI/src/com/android/incallui/VideoCallPresenter.java
index 0fac39adc..312d259a8 100644
--- a/InCallUI/src/com/android/incallui/VideoCallPresenter.java
+++ b/InCallUI/src/com/android/incallui/VideoCallPresenter.java
@@ -26,10 +26,10 @@ import android.os.Handler;
 import android.os.Looper;
 import android.provider.ContactsContract;
 import android.telecom.AudioState;
-import android.telecom.CameraCapabilities;
 import android.telecom.Connection;
 import android.telecom.InCallService.VideoCall;
 import android.telecom.VideoProfile;
+import android.telecom.VideoProfile.CameraCapabilities;
 import android.view.Surface;
 import android.widget.ImageView;
 
-- 
cgit v1.2.3