summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorandroid-build-team Robot <android-build-team-robot@google.com>2017-06-22 07:09:08 +0000
committerandroid-build-team Robot <android-build-team-robot@google.com>2017-06-22 07:09:08 +0000
commiteb51701797341e21c6a068c332a30fcc5a7bd5aa (patch)
tree4428e53bfc623fdaeeac1fddaefed5b9e3339b03
parent9c652989df49633ba7c0f363e21bc8890a1ff242 (diff)
parent2d6d4d23a96d011f6d6927b6e244529773256157 (diff)
downloadandroid_packages_apps_Camera2-lineage-15.0.zip
android_packages_apps_Camera2-lineage-15.0.tar.gz
android_packages_apps_Camera2-lineage-15.0.tar.bz2
release-request-767e2998-9243-43e0-b656-1acb30ac5115-for-git_oc-release-4124637 snap-temp-L74200000076595014lineage-15.0
Change-Id: Ia4499a986affeb0ee00e8a897479c47935203d52
-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 bf48898..57384db 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 {