summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Bestas <mikeioannina@gmail.com>2016-09-29 18:07:57 +0300
committerSteve Kondik <shade@chemlab.org>2016-09-30 14:42:23 -0700
commit714fc7e212e6f1c68d0f09b71855c4362aea9ff2 (patch)
tree91e9b72c1b53376696c577a2f38bb7011ba85944
parent597e7cc826eb65c0fcf2b600f4aef76a13e02a45 (diff)
downloadandroid_packages_apps_Snap-714fc7e212e6f1c68d0f09b71855c4362aea9ff2.zip
android_packages_apps_Snap-714fc7e212e6f1c68d0f09b71855c4362aea9ff2.tar.gz
android_packages_apps_Snap-714fc7e212e6f1c68d0f09b71855c4362aea9ff2.tar.bz2
Fix another mismerge of "SnapdragonCamera: fix screen flash on resuming"
Change-Id: Ibcea6008e354ffcc9eac5db11edede99ef5f20db
-rw-r--r--src/com/android/camera/PhotoModule.java6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/com/android/camera/PhotoModule.java b/src/com/android/camera/PhotoModule.java
index 26a3210..7f08d78 100644
--- a/src/com/android/camera/PhotoModule.java
+++ b/src/com/android/camera/PhotoModule.java
@@ -2878,9 +2878,6 @@ public class PhotoModule
}
setCameraParameters(UPDATE_PARAM_ALL);
-
- mCameraDevice.startPreview();
- setCameraState(IDLE);
mCameraDevice.setOneShotPreviewCallback(mHandler,
new CameraManager.CameraPreviewDataCallback() {
@Override
@@ -2888,6 +2885,9 @@ public class PhotoModule
mUI.hidePreviewCover();
}
});
+ mCameraDevice.startPreview();
+
+ setCameraState(IDLE);
mHandler.sendEmptyMessage(ON_PREVIEW_STARTED);
setDisplayOrientation();