diff options
| author | Steve Kondik <steve@cyngn.com> | 2016-11-11 04:42:43 -0800 |
|---|---|---|
| committer | Michael Bestas <mikeioannina@gmail.com> | 2017-01-04 22:00:40 +0200 |
| commit | 13ca178c2f1c614bc6c615b29986fc6002a89d5a (patch) | |
| tree | 2e2f9885db8ffc0c9c20d41e6415b0aac1a33b1e /src/com/android/camera/CameraHolder.java | |
| parent | f4b0a07e3e9f7ab325660b0c8dca82eb392e8168 (diff) | |
| download | android_packages_apps_Snap-13ca178c2f1c614bc6c615b29986fc6002a89d5a.tar.gz android_packages_apps_Snap-13ca178c2f1c614bc6c615b29986fc6002a89d5a.tar.bz2 android_packages_apps_Snap-13ca178c2f1c614bc6c615b29986fc6002a89d5a.zip | |
snap: Get rid of static Context member
* These are never a good thing. Instead pass the activity
thru CameraUtil.
Change-Id: I30d73fa329e174b20e0075a49e6d1e059e30aa3e
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() { |