summaryrefslogtreecommitdiffstats
path: root/src/com/android/camera/CameraActivity.java
diff options
context:
space:
mode:
authorSol Boucher <solb@google.com>2014-07-02 10:37:18 -0700
committerSol Boucher <solb@google.com>2014-07-08 13:47:12 -0700
commitd8cc3ea58938f78012991360cef7a6b3a2e51ccc (patch)
tree22c070604195459af5ce5aa3b9e1cc5160852bdd /src/com/android/camera/CameraActivity.java
parent10a16544048c3e5e1b380219144d501351163dc1 (diff)
downloadandroid_packages_apps_Camera2-d8cc3ea58938f78012991360cef7a6b3a2e51ccc.tar.gz
android_packages_apps_Camera2-d8cc3ea58938f78012991360cef7a6b3a2e51ccc.tar.bz2
android_packages_apps_Camera2-d8cc3ea58938f78012991360cef7a6b3a2e51ccc.zip
Make app build against updated frameworks/ex portability library
This is necessary to make the app build and run against the updated library, and specifically the CameraAgentFactory, CameraAgent, and CameraAgent.CameraProxy contracts. Change-Id: I2dde04df7ae552eec022d31f78b0ce05525282cd
Diffstat (limited to 'src/com/android/camera/CameraActivity.java')
-rw-r--r--src/com/android/camera/CameraActivity.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/com/android/camera/CameraActivity.java b/src/com/android/camera/CameraActivity.java
index 869ec388d..6c379140c 100644
--- a/src/com/android/camera/CameraActivity.java
+++ b/src/com/android/camera/CameraActivity.java
@@ -1305,7 +1305,7 @@ public class CameraActivity extends Activity
mMainHandler = new MainHandler(this, getMainLooper());
mCameraController =
new CameraController(mAppContext, this, mMainHandler,
- CameraAgentFactory.getAndroidCameraAgent());
+ CameraAgentFactory.getAndroidCameraAgent(this));
mCameraController.setCameraDefaultExceptionCallback(mCameraDefaultExceptionCallback,
mMainHandler);