summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorByunghun Jeon <bjeon@codeaurora.org>2015-10-06 14:42:58 -0700
committerSteve Kondik <steve@cyngn.com>2016-08-03 15:44:40 -0700
commit48feef948c83e55c76f91d20468cddb65ce24806 (patch)
treecb8e2e01d56a75b7a2a01a8a60152f5151c648ed /src
parente99828ded0f7abd6f5b758f1eaebf628cb8818d3 (diff)
downloadandroid_packages_apps_Snap-48feef948c83e55c76f91d20468cddb65ce24806.tar.gz
android_packages_apps_Snap-48feef948c83e55c76f91d20468cddb65ce24806.tar.bz2
android_packages_apps_Snap-48feef948c83e55c76f91d20468cddb65ce24806.zip
SnapdragonCamera: Fix crash issue with enable FD with TruePortrait
Fixes ui operation on background thread issue with always enabling FD with TruePortrait on. Change-Id: I976d206c2114aba1e1c5ae4b53959093c2836942
Diffstat (limited to 'src')
-rw-r--r--src/com/android/camera/PhotoModule.java15
1 files changed, 13 insertions, 2 deletions
diff --git a/src/com/android/camera/PhotoModule.java b/src/com/android/camera/PhotoModule.java
index 682199d72..a991e4398 100644
--- a/src/com/android/camera/PhotoModule.java
+++ b/src/com/android/camera/PhotoModule.java
@@ -3265,7 +3265,13 @@ public class PhotoModule
.equals(advancedFeature)) {
// face detection must always be on for truePortrait
if (CameraUtil.isSupported(Parameters.FACE_DETECTION_ON, mParameters.getSupportedFaceDetectionModes())) {
- mUI.overrideSettings(CameraSettings.KEY_FACE_DETECTION, Parameters.FACE_DETECTION_ON);
+ mActivity.runOnUiThread(new Runnable() {
+ @Override
+ public void run() {
+ mUI.overrideSettings(CameraSettings.KEY_FACE_DETECTION, Parameters.FACE_DETECTION_ON);
+ }
+ });
+
mParameters.setFaceDetectionMode(Parameters.FACE_DETECTION_ON);
if(mFaceDetectionEnabled == false) {
mFaceDetectionEnabled = true;
@@ -3275,7 +3281,12 @@ public class PhotoModule
} else {
// Set face detetction parameter.
// clear override to re-enable setting if true portrait is off.
- mUI.overrideSettings(CameraSettings.KEY_FACE_DETECTION, null);
+ mActivity.runOnUiThread(new Runnable() {
+ @Override
+ public void run() {
+ mUI.overrideSettings(CameraSettings.KEY_FACE_DETECTION, null);
+ }
+ });
String faceDetection = mPreferences.getString(
CameraSettings.KEY_FACE_DETECTION,