summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/com/android/camera/CameraActivity.java2
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 {