diff options
author | android-build-team Robot <android-build-team-robot@google.com> | 2017-06-22 07:09:08 +0000 |
---|---|---|
committer | android-build-team Robot <android-build-team-robot@google.com> | 2017-06-22 07:09:08 +0000 |
commit | eb51701797341e21c6a068c332a30fcc5a7bd5aa (patch) | |
tree | 4428e53bfc623fdaeeac1fddaefed5b9e3339b03 | |
parent | 9c652989df49633ba7c0f363e21bc8890a1ff242 (diff) | |
parent | 2d6d4d23a96d011f6d6927b6e244529773256157 (diff) | |
download | Camera2-eb51701797341e21c6a068c332a30fcc5a7bd5aa.tar.gz |
release-request-767e2998-9243-43e0-b656-1acb30ac5115-for-git_oc-release-4124637 snap-temp-L74200000076595014android-security-8.0.0_r54android-security-8.0.0_r53android-security-8.0.0_r52android-cts-8.0_r9android-cts-8.0_r8android-cts-8.0_r7android-cts-8.0_r6android-cts-8.0_r5android-cts-8.0_r4android-cts-8.0_r3android-cts-8.0_r26android-cts-8.0_r25android-cts-8.0_r24android-cts-8.0_r23android-cts-8.0_r22android-cts-8.0_r21android-cts-8.0_r20android-cts-8.0_r2android-cts-8.0_r19android-cts-8.0_r18android-cts-8.0_r17android-cts-8.0_r16android-cts-8.0_r15android-cts-8.0_r14android-cts-8.0_r13android-cts-8.0_r12android-cts-8.0_r11android-cts-8.0_r10android-cts-8.0_r1android-8.0.0_r9android-8.0.0_r7android-8.0.0_r51android-8.0.0_r50android-8.0.0_r49android-8.0.0_r48android-8.0.0_r47android-8.0.0_r46android-8.0.0_r45android-8.0.0_r44android-8.0.0_r43android-8.0.0_r42android-8.0.0_r41android-8.0.0_r40android-8.0.0_r4android-8.0.0_r39android-8.0.0_r38android-8.0.0_r37android-8.0.0_r36android-8.0.0_r35android-8.0.0_r32android-8.0.0_r31android-8.0.0_r30android-8.0.0_r3android-8.0.0_r29android-8.0.0_r28android-8.0.0_r2android-8.0.0_r17android-8.0.0_r16android-8.0.0_r15android-8.0.0_r13android-8.0.0_r12android-8.0.0_r11android-8.0.0_r10android-8.0.0_r1security-oc-releaseoreo-security-releaseoreo-releaseoreo-r6-releaseoreo-r5-releaseoreo-r4-releaseoreo-r3-releaseoreo-r2-releaseoreo-cts-release
Change-Id: Ia4499a986affeb0ee00e8a897479c47935203d52
-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 { |