Fix image/video capture intents are broken after switching cameras.

The intent action should be kept if it is IMAGE_CAPTURE or
VIDEO_CAPTURE.

This also fixes the bug that video capture will fail after retake.
If the URI is passed in by the intent, it should not be removed
from the content resolver.

bug:4083519

Change-Id: Ia72e399ff8cd5c2a72cc6fe1500ee6922d9a4f5d

1 files changed, 7 insertions, 1 deletions

diff --git a/src/com/android/camera/Camera.java b/src/com/android/camera/Camera.java
index 486a712..67ac246 100644
--- a/src/com/android/camera/Camera.java
+++ b/src/com/android/camera/Camera.java
@@ -2248,7 +2248,13 @@ public class Camera extends ActivityBase implements View.OnClickListener,
             // Restart the activity to have a crossfade animation.
             // TODO: Use SurfaceTexture to implement a better and faster
             // animation.
-            MenuHelper.gotoCameraMode(this);
+            if (mIsImageCaptureIntent) {
+                // If the intent is camera capture, stay in camera capture mode.
+                MenuHelper.gotoCameraMode(this, getIntent());
+            } else {
+                MenuHelper.gotoCameraMode(this);
+            }
+
             finish();
         } else {
             setCameraParametersWhenIdle(UPDATE_PARAM_PREFERENCE);