diff options
Diffstat (limited to 'camera2')
-rw-r--r-- | camera2/portability/tests/src/com/android/ex/camera2/portability/Camera2PortabilityTest.java | 1 | ||||
-rw-r--r-- | camera2/utils/tests/src/com/android/ex/camera2/utils/Camera2DeviceTester.java | 5 |
2 files changed, 2 insertions, 4 deletions
diff --git a/camera2/portability/tests/src/com/android/ex/camera2/portability/Camera2PortabilityTest.java b/camera2/portability/tests/src/com/android/ex/camera2/portability/Camera2PortabilityTest.java index 1f340fd..5fed6fb 100644 --- a/camera2/portability/tests/src/com/android/ex/camera2/portability/Camera2PortabilityTest.java +++ b/camera2/portability/tests/src/com/android/ex/camera2/portability/Camera2PortabilityTest.java @@ -27,7 +27,6 @@ import android.hardware.camera2.CameraCharacteristics; import android.hardware.camera2.CameraDevice; import android.hardware.camera2.CameraManager; import android.hardware.camera2.CaptureRequest; -import android.support.test.InjectContext; import com.android.ex.camera2.portability.CameraCapabilities.FlashMode; import com.android.ex.camera2.portability.CameraCapabilities.FocusMode; diff --git a/camera2/utils/tests/src/com/android/ex/camera2/utils/Camera2DeviceTester.java b/camera2/utils/tests/src/com/android/ex/camera2/utils/Camera2DeviceTester.java index e8639ba..b6f7bd0 100644 --- a/camera2/utils/tests/src/com/android/ex/camera2/utils/Camera2DeviceTester.java +++ b/camera2/utils/tests/src/com/android/ex/camera2/utils/Camera2DeviceTester.java @@ -21,7 +21,7 @@ import android.hardware.camera2.CameraDevice; import android.hardware.camera2.CameraManager; import android.os.Handler; import android.os.HandlerThread; -import android.support.test.InjectContext; +import android.support.test.InstrumentationRegistry; import org.junit.After; import org.junit.AfterClass; @@ -49,8 +49,7 @@ public class Camera2DeviceTester { sThread.join(); } - @InjectContext - public Context mContext; + public Context mContext = InstrumentationRegistry.getTargetContext(); private class DeviceCapturer extends CameraDevice.StateCallback { private CameraDevice mCamera; |