| commit | 0f215ce43e23f8c72b8caeb710946ae40dac07d3 | [log] [tgz] |
|---|---|---|
| author | Yorke Lee <yorkelee@google.com> | Tue May 12 13:32:42 2015 -0700 |
| committer | Yorke Lee <yorkelee@google.com> | Tue May 12 13:32:42 2015 -0700 |
| tree | 10203d95483bd531b5fb67ca7fc2d2dc856c84db | |
| parent | 6a2126477ce3f527ecaec807fe4f40cd13ff02b0 [diff] |
Fixes for APi review Move CameraCapabilities into VideoProfile Make PhoneAccount and PhoneAccountHandle final Bug: 21040387 Bug: 21066505 Change-Id: I5602031786a845eb8b7b62e64db511f32b4ac2ec
diff --git a/testapps/src/com/android/server/telecom/testapps/TestCallList.java b/testapps/src/com/android/server/telecom/testapps/TestCallList.java index 98ad0ab..d6ed306 100644 --- a/testapps/src/com/android/server/telecom/testapps/TestCallList.java +++ b/testapps/src/com/android/server/telecom/testapps/TestCallList.java
@@ -17,9 +17,9 @@ package com.android.server.telecom.testapps; import android.telecom.Call; -import android.telecom.CameraCapabilities; import android.telecom.InCallService; import android.telecom.VideoProfile; +import android.telecom.VideoProfile.CameraCapabilities; import android.util.ArrayMap; import android.util.ArraySet; import android.util.Log;
diff --git a/testapps/src/com/android/server/telecom/testapps/TestManagedVideoProvider.java b/testapps/src/com/android/server/telecom/testapps/TestManagedVideoProvider.java index a78643f..a0af531 100644 --- a/testapps/src/com/android/server/telecom/testapps/TestManagedVideoProvider.java +++ b/testapps/src/com/android/server/telecom/testapps/TestManagedVideoProvider.java
@@ -16,10 +16,10 @@ package com.android.server.telecom.testapps; -import android.telecom.CameraCapabilities; import android.telecom.Connection; import android.telecom.RemoteConnection; import android.telecom.VideoProfile; +import android.telecom.VideoProfile.CameraCapabilities; import android.view.Surface; public class TestManagedVideoProvider extends Connection.VideoProvider {
diff --git a/testapps/src/com/android/server/telecom/testapps/TestVideoProvider.java b/testapps/src/com/android/server/telecom/testapps/TestVideoProvider.java index 790ca15..adc3abf 100644 --- a/testapps/src/com/android/server/telecom/testapps/TestVideoProvider.java +++ b/testapps/src/com/android/server/telecom/testapps/TestVideoProvider.java
@@ -35,9 +35,9 @@ import android.hardware.camera2.params.StreamConfigurationMap; import android.media.MediaPlayer; import android.os.Handler; -import android.telecom.CameraCapabilities; import android.telecom.Connection; import android.telecom.VideoProfile; +import android.telecom.VideoProfile.CameraCapabilities; import android.text.TextUtils; import android.util.Log; import android.util.Size;