Revert "SnapdragonCamera:Fix no recording thumbnail when capture during recording."

This reverts commit 0c38495f9f0aae023de5bdfb0ada2f846000278f.

Change-Id: I113f5142fca4bc53163d5de9105fb865b34683b3

2 files changed, 3 insertions, 7 deletions

diff --git a/src/com/android/camera/PhotoUI.java b/src/com/android/camera/PhotoUI.java
index 84a6f90d0..50b5f64fe 100755
--- a/src/com/android/camera/PhotoUI.java
+++ b/src/com/android/camera/PhotoUI.java
@@ -1229,7 +1229,9 @@ public class PhotoUI implements PieListener,
             mLocationDialog.dismiss();
         }
         mLocationDialog = null;
-        mMenu.animateSlideOutPreviewMenu();
+        if (mMenu != null) {
+            mMenu.animateSlideOutPreviewMenu();
+        }
     }
 
     public void initDisplayChangeListener() {
diff --git a/src/com/android/camera/VideoModule.java b/src/com/android/camera/VideoModule.java
index 0f5fe324a..103529bb8 100644
--- a/src/com/android/camera/VideoModule.java
+++ b/src/com/android/camera/VideoModule.java
@@ -1731,12 +1731,6 @@ public class VideoModule implements CameraModule,
 
     private void saveVideo() {
         if (mVideoFileDescriptor == null) {
-            //use the recording stop timestamp to generate the video's file name.
-            String videoSourcePath = mVideoFilename;
-            generateVideoFilename(mProfile.fileFormat);
-            mCurrentVideoFilename = mVideoFilename;
-            File sourceFile = new File(videoSourcePath);
-            sourceFile.renameTo(new File(mCurrentVideoFilename));
             File origFile = new File(mCurrentVideoFilename);
             if (!origFile.exists() || origFile.length() <= 0) {
                 Log.e(TAG, "Invalid file");