diff options
| author | Sascha Häberling <haeberling@google.com> | 2014-09-06 02:48:13 +0000 |
|---|---|---|
| committer | Sascha Häberling <haeberling@google.com> | 2014-09-06 02:48:13 +0000 |
| commit | bcc384ea15fc9d25ee3efd934c2ac7ec7a059a52 (patch) | |
| tree | f556bbd937e62cb1dbf0ba7247103e4e541c7103 /src_pd | |
| parent | f6bf65e9442f2fb7042e37ec21bf1c6c4fbd9bb6 (diff) | |
| download | android_packages_apps_Camera2-bcc384ea15fc9d25ee3efd934c2ac7ec7a059a52.tar.gz android_packages_apps_Camera2-bcc384ea15fc9d25ee3efd934c2ac7ec7a059a52.tar.bz2 android_packages_apps_Camera2-bcc384ea15fc9d25ee3efd934c2ac7ec7a059a52.zip | |
Revert "Pipe context through to camera"
Second half of the CL didn't make it through to lmp-dev due to Camera API change craziness. Reverting this one to unbreak the build and will submit again to G and H Camera branches only.
This reverts commit f6bf65e9442f2fb7042e37ec21bf1c6c4fbd9bb6.
Change-Id: I5e11c5c1b29586110ed504fbb1be2dfe76accab0
Diffstat (limited to 'src_pd')
| -rw-r--r-- | src_pd/com/android/camera/one/v2/OneCameraCreator.java | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src_pd/com/android/camera/one/v2/OneCameraCreator.java b/src_pd/com/android/camera/one/v2/OneCameraCreator.java index afb96b359..472066380 100644 --- a/src_pd/com/android/camera/one/v2/OneCameraCreator.java +++ b/src_pd/com/android/camera/one/v2/OneCameraCreator.java @@ -16,7 +16,6 @@ package com.android.camera.one.v2; -import android.content.Context; import android.hardware.camera2.CameraCharacteristics; import android.hardware.camera2.CameraDevice; import android.util.DisplayMetrics; @@ -26,7 +25,7 @@ import com.android.camera.one.OneCamera; import com.android.camera.util.Size; public class OneCameraCreator { - public static OneCamera create(Context context, boolean useHdr, CameraDevice device, + public static OneCamera create(boolean useHdr, CameraDevice device, CameraCharacteristics characteristics, Size pictureSize, int maxMemoryMB, DisplayMetrics displayMetrics, SoundPlayer soundPlayer) { // TODO: Might want to switch current camera to vendor HDR. |