diff options
Diffstat (limited to 'media/tests/MediaFrameworkTest/src/com')
8 files changed, 26 insertions, 26 deletions
diff --git a/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/integration/CameraBinderTest.java b/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/integration/CameraBinderTest.java index bc3adc9..4053666 100644 --- a/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/integration/CameraBinderTest.java +++ b/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/integration/CameraBinderTest.java @@ -22,9 +22,9 @@ import android.hardware.ICameraClient; import android.hardware.ICameraServiceListener; import android.hardware.IProCameraCallbacks; import android.hardware.IProCameraUser; -import android.hardware.photography.CameraMetadata; -import android.hardware.photography.ICameraDeviceCallbacks; -import android.hardware.photography.ICameraDeviceUser; +import android.hardware.camera2.CameraMetadata; +import android.hardware.camera2.ICameraDeviceCallbacks; +import android.hardware.camera2.ICameraDeviceUser; import android.os.Binder; import android.os.IBinder; import android.os.RemoteException; diff --git a/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/integration/CameraDeviceBinderTest.java b/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/integration/CameraDeviceBinderTest.java index a9a0757..acd76d5 100644 --- a/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/integration/CameraDeviceBinderTest.java +++ b/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/integration/CameraDeviceBinderTest.java @@ -17,18 +17,18 @@ package com.android.mediaframeworktest.integration; import android.graphics.SurfaceTexture; -import android.hardware.photography.CameraMetadata; -import android.hardware.photography.CameraPropertiesKeys; -import android.hardware.photography.CaptureRequest; -import android.hardware.photography.ICameraDeviceCallbacks; -import android.hardware.photography.ICameraDeviceUser; +import android.hardware.camera2.CameraMetadata; +import android.hardware.camera2.CameraPropertiesKeys; +import android.hardware.camera2.CaptureRequest; +import android.hardware.camera2.ICameraDeviceCallbacks; +import android.hardware.camera2.ICameraDeviceUser; import android.os.RemoteException; import android.test.AndroidTestCase; import android.test.suitebuilder.annotation.SmallTest; import android.util.Log; import android.view.Surface; -import static android.hardware.photography.CameraDevice.TEMPLATE_PREVIEW; +import static android.hardware.camera2.CameraDevice.TEMPLATE_PREVIEW; import com.android.mediaframeworktest.MediaFrameworkIntegrationTestRunner; import com.android.mediaframeworktest.integration.CameraBinderTest.DummyBase; diff --git a/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/unit/CameraMetadataTest.java b/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/unit/CameraMetadataTest.java index 131441b..ecf01d9 100644 --- a/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/unit/CameraMetadataTest.java +++ b/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/unit/CameraMetadataTest.java @@ -20,11 +20,11 @@ import android.os.Parcel; import android.test.suitebuilder.annotation.SmallTest; import android.graphics.ImageFormat; import android.graphics.Rect; -import android.hardware.photography.CameraMetadata; -import android.hardware.photography.Rational; -import android.hardware.photography.Size; +import android.hardware.camera2.CameraMetadata; +import android.hardware.camera2.Rational; +import android.hardware.camera2.Size; -import static android.hardware.photography.CameraMetadata.*; +import static android.hardware.camera2.CameraMetadata.*; import java.lang.reflect.Array; import java.nio.ByteBuffer; diff --git a/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/unit/CameraUtilsBinderDecoratorTest.java b/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/unit/CameraUtilsBinderDecoratorTest.java index 7c48992..727af78 100644 --- a/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/unit/CameraUtilsBinderDecoratorTest.java +++ b/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/unit/CameraUtilsBinderDecoratorTest.java @@ -16,17 +16,17 @@ package com.android.mediaframeworktest.unit; -import android.hardware.photography.CameraAccessException; -import android.hardware.photography.utils.CameraBinderDecorator; -import android.hardware.photography.utils.CameraRuntimeException; +import android.hardware.camera2.CameraAccessException; +import android.hardware.camera2.utils.CameraBinderDecorator; +import android.hardware.camera2.utils.CameraRuntimeException; import android.os.DeadObjectException; import android.os.RemoteException; import android.os.TransactionTooLargeException; import android.test.suitebuilder.annotation.SmallTest; import static org.mockito.Mockito.*; -import static android.hardware.photography.utils.CameraBinderDecorator.*; -import static android.hardware.photography.CameraAccessException.*; +import static android.hardware.camera2.utils.CameraBinderDecorator.*; +import static android.hardware.camera2.CameraAccessException.*; import junit.framework.Assert; diff --git a/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/unit/CameraUtilsDecoratorTest.java b/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/unit/CameraUtilsDecoratorTest.java index bae17fa..c3b6006 100644 --- a/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/unit/CameraUtilsDecoratorTest.java +++ b/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/unit/CameraUtilsDecoratorTest.java @@ -17,8 +17,8 @@ package com.android.mediaframeworktest.unit; import android.test.suitebuilder.annotation.SmallTest; -import android.hardware.photography.utils.*; -import android.hardware.photography.utils.Decorator.DecoratorListener; +import android.hardware.camera2.utils.*; +import android.hardware.camera2.utils.Decorator.DecoratorListener; import junit.framework.Assert; diff --git a/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/unit/CameraUtilsRuntimeExceptionTest.java b/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/unit/CameraUtilsRuntimeExceptionTest.java index 8c2dd4d..02c9f2a 100644 --- a/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/unit/CameraUtilsRuntimeExceptionTest.java +++ b/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/unit/CameraUtilsRuntimeExceptionTest.java @@ -16,9 +16,9 @@ package com.android.mediaframeworktest.unit; -import android.hardware.photography.CameraAccessException; -import android.hardware.photography.utils.CameraRuntimeException; -import android.hardware.photography.utils.UncheckedThrow; +import android.hardware.camera2.CameraAccessException; +import android.hardware.camera2.utils.CameraRuntimeException; +import android.hardware.camera2.utils.UncheckedThrow; import android.test.suitebuilder.annotation.SmallTest; import junit.framework.Assert; diff --git a/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/unit/CameraUtilsUncheckedThrowTest.java b/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/unit/CameraUtilsUncheckedThrowTest.java index cbe123c..b648763 100644 --- a/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/unit/CameraUtilsUncheckedThrowTest.java +++ b/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/unit/CameraUtilsUncheckedThrowTest.java @@ -16,8 +16,8 @@ package com.android.mediaframeworktest.unit; -import android.hardware.photography.CameraAccessException; -import android.hardware.photography.utils.UncheckedThrow; +import android.hardware.camera2.CameraAccessException; +import android.hardware.camera2.utils.UncheckedThrow; import android.test.suitebuilder.annotation.SmallTest; import junit.framework.Assert; diff --git a/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/unit/RationalTest.java b/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/unit/RationalTest.java index c15d030..926719c 100644 --- a/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/unit/RationalTest.java +++ b/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/unit/RationalTest.java @@ -17,7 +17,7 @@ package com.android.mediaframeworktest.unit; import android.test.suitebuilder.annotation.SmallTest; -import android.hardware.photography.Rational; +import android.hardware.camera2.Rational; /** * <pre> |