summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorGuruprasad Gaonkar <ggaonk@codeaurora.org>2015-08-07 17:43:40 -0700
committerGuruprasad Gaonkar <ggaonk@codeaurora.org>2015-08-07 17:48:00 -0700
commit57192594aaf4d2d4ec62b2bb3ebbca63e691aca1 (patch)
tree2979de7422424fa9836252378cca9c4610e38f6b /src
parent5179bc00d2b8d29ed008564f77b112f04afea973 (diff)
downloadandroid_packages_apps_Snap-57192594aaf4d2d4ec62b2bb3ebbca63e691aca1.tar.gz
android_packages_apps_Snap-57192594aaf4d2d4ec62b2bb3ebbca63e691aca1.tar.bz2
android_packages_apps_Snap-57192594aaf4d2d4ec62b2bb3ebbca63e691aca1.zip
SnapDragon: Changes to create UI object before openCamera.
OpenCamera is excecuted on a thread. This thread will access UI object which was not initialized. Change-Id: I1cb15036e0b54a38a1d9750856b1eef5aa9dda43
Diffstat (limited to 'src')
-rw-r--r--src/com/android/camera/PhotoModule.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/com/android/camera/PhotoModule.java b/src/com/android/camera/PhotoModule.java
index fd251cee3..5c5fe8e8c 100644
--- a/src/com/android/camera/PhotoModule.java
+++ b/src/com/android/camera/PhotoModule.java
@@ -493,11 +493,11 @@ public class PhotoModule
mPreferences.setLocalId(mActivity, mCameraId);
CameraSettings.upgradeLocalPreferences(mPreferences.getLocal());
+ mUI = new PhotoUI(activity, this, parent);
if (mOpenCameraThread == null) {
mOpenCameraThread = new OpenCameraThread();
mOpenCameraThread.start();
}
- mUI = new PhotoUI(activity, this, parent);
initializeControlByIntent();
mQuickCapture = mActivity.getIntent().getBooleanExtra(EXTRA_QUICK_CAPTURE, false);
mLocationManager = new LocationManager(mActivity, mUI);