diff options
| author | Sascha Haeberling <haeberling@google.com> | 2014-09-05 17:33:59 -0700 |
|---|---|---|
| committer | Sascha Haeberling <haeberling@google.com> | 2014-09-05 18:28:24 -0700 |
| commit | f6bf65e9442f2fb7042e37ec21bf1c6c4fbd9bb6 (patch) | |
| tree | 75e5b09554b86b3a25bbca4d149271db589c5baa /src_pd | |
| parent | 9eb0eb55e686c84d0003cdcd60c76e08ed369468 (diff) | |
| download | android_packages_apps_Camera2-f6bf65e9442f2fb7042e37ec21bf1c6c4fbd9bb6.tar.gz android_packages_apps_Camera2-f6bf65e9442f2fb7042e37ec21bf1c6c4fbd9bb6.tar.bz2 android_packages_apps_Camera2-f6bf65e9442f2fb7042e37ec21bf1c6c4fbd9bb6.zip | |
Pipe context through to camera
Bug: 17203825
Also don't just activate the shutter after a picture has been taken
since some cameras might not be ready for another picture yet.
This decision should be up to the camera.
Change-Id: I5991da1d8fc942b48fe085b18ec93b07bfafe889
Diffstat (limited to 'src_pd')
| -rw-r--r-- | src_pd/com/android/camera/one/v2/OneCameraCreator.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src_pd/com/android/camera/one/v2/OneCameraCreator.java b/src_pd/com/android/camera/one/v2/OneCameraCreator.java index 472066380..afb96b359 100644 --- a/src_pd/com/android/camera/one/v2/OneCameraCreator.java +++ b/src_pd/com/android/camera/one/v2/OneCameraCreator.java @@ -16,6 +16,7 @@ package com.android.camera.one.v2; +import android.content.Context; import android.hardware.camera2.CameraCharacteristics; import android.hardware.camera2.CameraDevice; import android.util.DisplayMetrics; @@ -25,7 +26,7 @@ import com.android.camera.one.OneCamera; import com.android.camera.util.Size; public class OneCameraCreator { - public static OneCamera create(boolean useHdr, CameraDevice device, + public static OneCamera create(Context context, boolean useHdr, CameraDevice device, CameraCharacteristics characteristics, Size pictureSize, int maxMemoryMB, DisplayMetrics displayMetrics, SoundPlayer soundPlayer) { // TODO: Might want to switch current camera to vendor HDR. |