Only onboard when launched through front door.

When an app is using public API to take a photo, don't confuse the
user with the onboarding flow.

Test: cts-tradefed run commandAndExit cts-dev -m CtsProviderTestCases -t android.provider.cts.MediaStoreUiTest#testImageCapture
Bug: 62204676
Change-Id: Ie0de7b879302a5dd4bf941bf31b449bda95cfdf7

diff --git a/src/com/android/camera/CameraActivity.java b/src/com/android/camera/CameraActivity.java
index bf48898..57384db 100644 (file)
--- 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 {