Merge "Fix the no "SD Card is full" bug. Now, we show the error message when we find out the storage may be not enough for next picture."

1 files changed, 4 insertions, 8 deletions

diff --git a/src/com/android/camera/Camera.java b/src/com/android/camera/Camera.java
index 0b1155e..cbb6aa1 100644
--- a/src/com/android/camera/Camera.java
+++ b/src/com/android/camera/Camera.java
@@ -673,6 +673,10 @@ public class Camera extends NoSearchActivity implements View.OnClickListener,
             // the mean time and fill it, but that could have happened between the
             // shutter press and saving the JPEG too.
             calculatePicturesRemaining();
+
+            if (mPicturesRemaining < 1) {
+                updateStorageHint(mPicturesRemaining);
+            }
         }
     }
 
@@ -868,14 +872,6 @@ public class Camera extends NoSearchActivity implements View.OnClickListener,
             mCaptureStartTime = System.currentTimeMillis();
             mPostViewPictureCallbackTime = 0;
 
-            // Don't check the filesystem here, we can't afford the latency.
-            // Instead, check the cached value which was calculated when the
-            // preview was restarted.
-            if (mPicturesRemaining < 1) {
-                updateStorageHint(mPicturesRemaining);
-                return;
-            }
-
             mStatus = SNAPSHOT_IN_PROGRESS;
 
             mImageCapture.initiate();