pull/360/head
Mattia Iavarone 7 years ago
parent 2cd8ad1fa6
commit 24d08c7aa1
  1. 4
      cameraview/src/androidTest/java/com/otaliastudios/cameraview/IntegrationTest.java
  2. 4
      cameraview/src/main/java/com/otaliastudios/cameraview/CameraView.java

@ -38,7 +38,7 @@ import static org.mockito.Mockito.mock;
*/ */
@RunWith(AndroidJUnit4.class) @RunWith(AndroidJUnit4.class)
@MediumTest @MediumTest
// @Ignore @Ignore
public class IntegrationTest extends BaseTest { public class IntegrationTest extends BaseTest {
@Rule @Rule
@ -374,7 +374,7 @@ public class IntegrationTest extends BaseTest {
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR1) { if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR1) {
Camera.CameraInfo info = new Camera.CameraInfo(); Camera.CameraInfo info = new Camera.CameraInfo();
Camera.getCameraInfo(camera.getCameraId(), info); Camera.getCameraInfo(controller.mCameraId, info);
if (info.canDisableShutterSound) { if (info.canDisableShutterSound) {
assertEquals(newValue, camera.getPlaySounds()); assertEquals(newValue, camera.getPlaySounds());
} }

@ -1606,9 +1606,5 @@ public class CameraView extends FrameLayout implements LifecycleObserver {
//region deprecated APIs //region deprecated APIs
/* for tests */int getCameraId(){
return mCameraController.mCameraId;
}
//endregion //endregion
} }

Loading…
Cancel
Save