diff options
| author | Jeff Sharkey <jsharkey@android.com> | 2017-06-21 17:45:31 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-06-21 17:45:31 +0000 |
| commit | b03b959426f2b62b0e479f23a6615b970d2652ba (patch) | |
| tree | 7532746d582424b87dc4d3aa52ab34be538e6309 | |
| parent | 485fee252bbd2fed74a1aee2e39e52bc780ace87 (diff) | |
| parent | c34270d03d7bf0dc4f211649f5a2c4d9fc667a53 (diff) | |
| download | Camera2-b03b959426f2b62b0e479f23a6615b970d2652ba.tar.gz | |
Only onboard when launched through front door. am: 2d6d4d23a9
am: c34270d03d
Change-Id: I2572057489e7ffa53dfb6a8a7e8808a4f4be0a32
| -rw-r--r-- | src/com/android/camera/CameraActivity.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/com/android/camera/CameraActivity.java b/src/com/android/camera/CameraActivity.java index bf4889873..57384dbc7 100644 --- a/src/com/android/camera/CameraActivity.java +++ b/src/com/android/camera/CameraActivity.java @@ -1862,7 +1862,7 @@ public class CameraActivity extends QuickActivity finish(); return; } - if (!mSecureCamera) { + if (!isSecureCamera() && !isCaptureIntent()) { // Show the dialog if necessary. The rest resume logic will be invoked // at the onFirstRunStateReady() callback. try { |