diff options
| author | Sascha Häberling <haeberling@google.com> | 2014-09-06 02:50:42 +0000 |
|---|---|---|
| committer | Sascha Häberling <haeberling@google.com> | 2014-09-06 02:50:42 +0000 |
| commit | 13d07d0ecb3bc808fb6f5b65508b1948ab3149d8 (patch) | |
| tree | 75e5b09554b86b3a25bbca4d149271db589c5baa /src_pd | |
| parent | bcc384ea15fc9d25ee3efd934c2ac7ec7a059a52 (diff) | |
| download | android_packages_apps_Camera2-13d07d0ecb3bc808fb6f5b65508b1948ab3149d8.tar.gz android_packages_apps_Camera2-13d07d0ecb3bc808fb6f5b65508b1948ab3149d8.tar.bz2 android_packages_apps_Camera2-13d07d0ecb3bc808fb6f5b65508b1948ab3149d8.zip | |
DO NOT MERGE Pipe context through to camera
Bug: 17203825
Not merging since a CL depending on this one cannot be merged cleanly into lmp-dev right now: http://ag/541468
Will also apply this one to haleakala.
Change-Id: I7a386b92cf6168185bd28bd02a78d87c5826639a
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. |