diff options
author | Linux Build Service Account <lnxbuild@quicinc.com> | 2017-04-25 18:07:55 -0700 |
---|---|---|
committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2017-04-25 18:07:55 -0700 |
commit | 811c7a43a2c32861784936407aa9b6a39083f108 (patch) | |
tree | 4733784c6470358c0971eb2a1022d6828bdead4e /src | |
parent | e99e09065329b0a7a331ffc68b5b543809b653c9 (diff) | |
parent | b2b78aa11a0e5c90e81ba19ffdaa32044519a9d9 (diff) | |
download | android_packages_apps_Snap-811c7a43a2c32861784936407aa9b6a39083f108.tar.gz android_packages_apps_Snap-811c7a43a2c32861784936407aa9b6a39083f108.tar.bz2 android_packages_apps_Snap-811c7a43a2c32861784936407aa9b6a39083f108.zip |
Merge "SnapdragonCamera: Fix no flash settings menu" into camera.lnx.1.0-dev.1.0
Diffstat (limited to 'src')
-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 103529bb8..830c04079 100644 --- a/src/com/android/camera/VideoModule.java +++ b/src/com/android/camera/VideoModule.java @@ -1136,7 +1136,6 @@ public class VideoModule implements CameraModule, if(mWasMute != mIsMute) { setMute(mIsMute, false); } - initializeVideoControl(); showVideoSnapshotUI(false); installIntentFilter(); @@ -1153,6 +1152,7 @@ public class VideoModule implements CameraModule, mUI.enableShutter(true); } + initializeVideoControl(); mUI.applySurfaceChange(VideoUI.SURFACE_STATUS.SURFACE_VIEW); mUI.initDisplayChangeListener(); |