diff options
| author | Sol Boucher <solb@google.com> | 2014-08-16 00:23:35 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-08-15 21:23:40 +0000 |
| commit | f67f64f3b5272d1da317b8eda8e1ea1e46539416 (patch) | |
| tree | 8ac58f9f8b1abaa0ded08bb590400c4326eb0585 /src/com/android/camera/CameraActivity.java | |
| parent | a69d497fd44faab8afe65b748dfede715ea7239f (diff) | |
| parent | 44ce4b26614f85518d548a6750c7a08908ae3596 (diff) | |
| download | android_packages_apps_Camera2-f67f64f3b5272d1da317b8eda8e1ea1e46539416.tar.gz android_packages_apps_Camera2-f67f64f3b5272d1da317b8eda8e1ea1e46539416.tar.bz2 android_packages_apps_Camera2-f67f64f3b5272d1da317b8eda8e1ea1e46539416.zip | |
Merge "Enable seamless switching to/from camera2-backed Photo module" into ub-camera-glacier
Diffstat (limited to 'src/com/android/camera/CameraActivity.java')
| -rw-r--r-- | src/com/android/camera/CameraActivity.java | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/com/android/camera/CameraActivity.java b/src/com/android/camera/CameraActivity.java index ab2015877..a711e63af 100644 --- a/src/com/android/camera/CameraActivity.java +++ b/src/com/android/camera/CameraActivity.java @@ -1334,9 +1334,9 @@ public class CameraActivity extends Activity mActionBar = getActionBar(); mActionBar.addOnMenuVisibilityListener(this); mMainHandler = new MainHandler(this, getMainLooper()); - mCameraController = - new CameraController(mAppContext, this, mMainHandler, - CameraAgentFactory.getAndroidCameraAgent(this)); + mCameraController = new CameraController(mAppContext, this, mMainHandler, + CameraAgentFactory.getAndroidCameraAgent(this, CameraAgentFactory.CameraApi.API_1), + CameraAgentFactory.getAndroidCameraAgent(this, CameraAgentFactory.CameraApi.AUTO)); mCameraController.setCameraDefaultExceptionCallback(mCameraDefaultExceptionCallback, mMainHandler); @@ -1861,7 +1861,8 @@ public class CameraActivity extends Activity mCameraAppUI = null; mOrientationManager = null; mButtonManager = null; - CameraAgentFactory.recycle(); + CameraAgentFactory.recycle(CameraAgentFactory.CameraApi.API_1); + CameraAgentFactory.recycle(CameraAgentFactory.CameraApi.AUTO); super.onDestroy(); } |