diff options
author | Camera Software Integration <camswint@localhost> | 2016-11-15 07:05:39 -0800 |
---|---|---|
committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2016-11-15 07:05:39 -0800 |
commit | c6fb74a0f63210f1991686e4303ed928b23e5b4b (patch) | |
tree | 4e90933483450b4d50a3830437f06cf9dcb23f34 /src/com/android/camera/CaptureUI.java | |
parent | 835e1ab0df28156ade9d168ce5ce8b706765c44b (diff) | |
parent | f5b99060843d791ece129463dcc5e377cd89c072 (diff) | |
download | android_packages_apps_Snap-c6fb74a0f63210f1991686e4303ed928b23e5b4b.tar.gz android_packages_apps_Snap-c6fb74a0f63210f1991686e4303ed928b23e5b4b.tar.bz2 android_packages_apps_Snap-c6fb74a0f63210f1991686e4303ed928b23e5b4b.zip |
Merge "SnapdragonCamera: Fix camera can`t enter setting in pattern lock" into camera.lnx.1.0-dev.1.0
Diffstat (limited to 'src/com/android/camera/CaptureUI.java')
-rw-r--r-- | src/com/android/camera/CaptureUI.java | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/com/android/camera/CaptureUI.java b/src/com/android/camera/CaptureUI.java index 7c426073d..88460b865 100644 --- a/src/com/android/camera/CaptureUI.java +++ b/src/com/android/camera/CaptureUI.java @@ -527,6 +527,7 @@ public class CaptureUI implements FocusOverlayManager.FocusUI, clearFocus(); removeFilterMenu(false); Intent intent = new Intent(mActivity, SceneModeActivity.class); + intent.putExtra(CameraUtil.KEY_IS_SECURE_CAMERA, mActivity.isSecureCamera()); mActivity.startActivity(intent); } }); |