From fbef2206c21a10a8eb62db1018e172ab74d2f12d Mon Sep 17 00:00:00 2001 From: Mattia Iavarone Date: Sat, 3 Mar 2018 02:31:08 +0100 Subject: [PATCH] Nits --- .../java/com/otaliastudios/cameraview/IntegrationTest.java | 4 ++-- .../main/java/com/otaliastudios/cameraview/CameraView.java | 4 ---- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/cameraview/src/androidTest/java/com/otaliastudios/cameraview/IntegrationTest.java b/cameraview/src/androidTest/java/com/otaliastudios/cameraview/IntegrationTest.java index 5a5d0850..fe8469ab 100644 --- a/cameraview/src/androidTest/java/com/otaliastudios/cameraview/IntegrationTest.java +++ b/cameraview/src/androidTest/java/com/otaliastudios/cameraview/IntegrationTest.java @@ -38,7 +38,7 @@ import static org.mockito.Mockito.mock; */ @RunWith(AndroidJUnit4.class) @MediumTest -// @Ignore +@Ignore public class IntegrationTest extends BaseTest { @Rule @@ -374,7 +374,7 @@ public class IntegrationTest extends BaseTest { if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR1) { Camera.CameraInfo info = new Camera.CameraInfo(); - Camera.getCameraInfo(camera.getCameraId(), info); + Camera.getCameraInfo(controller.mCameraId, info); if (info.canDisableShutterSound) { assertEquals(newValue, camera.getPlaySounds()); } diff --git a/cameraview/src/main/java/com/otaliastudios/cameraview/CameraView.java b/cameraview/src/main/java/com/otaliastudios/cameraview/CameraView.java index 2ce688e8..2b3fe077 100644 --- a/cameraview/src/main/java/com/otaliastudios/cameraview/CameraView.java +++ b/cameraview/src/main/java/com/otaliastudios/cameraview/CameraView.java @@ -1606,9 +1606,5 @@ public class CameraView extends FrameLayout implements LifecycleObserver { //region deprecated APIs - /* for tests */int getCameraId(){ - return mCameraController.mCameraId; - } - //endregion }