diff options
Diffstat (limited to 'src/com/android/camera/CameraHolder.java')
-rw-r--r-- | src/com/android/camera/CameraHolder.java | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/com/android/camera/CameraHolder.java b/src/com/android/camera/CameraHolder.java index ee62eb2f6..9e0e32271 100644 --- a/src/com/android/camera/CameraHolder.java +++ b/src/com/android/camera/CameraHolder.java @@ -193,11 +193,10 @@ public class CameraHolder { } public synchronized CameraProxy open( + Context context, Handler handler, int cameraId, CameraManager.CameraOpenErrorCallback cb) { - Context context = CameraApp.getContext(); - if (DEBUG_OPEN_RELEASE) { collectState(cameraId, mCameraDevice); if (mCameraOpened) { @@ -263,8 +262,9 @@ public class CameraHolder { * unavailable then return {@code null}. */ public synchronized CameraProxy tryOpen( + Context context, Handler handler, int cameraId, CameraManager.CameraOpenErrorCallback cb) { - return (!mCameraOpened ? open(handler, cameraId, cb) : null); + return (!mCameraOpened ? open(context, handler, cameraId, cb) : null); } public synchronized void release() { |