diff options
| author | kaiyiz <kaiyiz@codeaurora.org> | 2014-06-18 09:46:45 +0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2014-06-17 18:47:41 -0700 |
| commit | a47e8256b9a3ac281df9b6d761fe8494d70aeeeb (patch) | |
| tree | 01649762c95b86ab86f0df4f0ca0edbe1a3b7815 /src/com/android/camera/VideoModule.java | |
| parent | 58b31f9123f2060a2ea8726a9176129dca554b34 (diff) | |
| download | android_packages_apps_Snap-a47e8256b9a3ac281df9b6d761fe8494d70aeeeb.tar.gz android_packages_apps_Snap-a47e8256b9a3ac281df9b6d761fe8494d70aeeeb.tar.bz2 android_packages_apps_Snap-a47e8256b9a3ac281df9b6d761fe8494d70aeeeb.zip | |
Camera2: fix flash light turn on after resume camera activity
If user choose an app to open video, onResume will be called after
the choose dialog is dismiss. The function opencamera will be called
and the value mPreviewFocused will be set true, which lead to flash
light turn on when setCameraParameters.
The value mPreviewFocused won't be true if not in Camera Preview, we
can use the visible of mCameraControls to judge.
CRs-Fixed: 680450
Change-Id: Ia04ae0fb77f05fb991e5262f86cbe6f308db7709
Diffstat (limited to 'src/com/android/camera/VideoModule.java')
| -rw-r--r-- | src/com/android/camera/VideoModule.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/com/android/camera/VideoModule.java b/src/com/android/camera/VideoModule.java index 14296c75d..d3c7bd42d 100644 --- a/src/com/android/camera/VideoModule.java +++ b/src/com/android/camera/VideoModule.java @@ -231,7 +231,7 @@ public class VideoModule implements CameraModule, return; } mParameters = mCameraDevice.getParameters(); - mPreviewFocused = true; + mPreviewFocused = arePreviewControlsVisible(); } //QCOM data Members Starts here |