summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorOwen Lin <owenlin@google.com>2010-02-03 15:09:38 -0800
committerOwen Lin <owenlin@google.com>2010-02-25 10:52:08 +0800
commit6d35fde323778d8e1725e399c80503061c200e16 (patch)
treebfe5ed4c0b853f8721315390a2820d4fddb68648 /src
parent17110a78c70e7f6112df64955023ccabc800439d (diff)
downloadLegacyCamera-6d35fde323778d8e1725e399c80503061c200e16.zip
LegacyCamera-6d35fde323778d8e1725e399c80503061c200e16.tar.gz
LegacyCamera-6d35fde323778d8e1725e399c80503061c200e16.tar.bz2
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. Bug: 2377057 Change-Id: Ie6684738a282c382cf6368276dd78f77ca848611
Diffstat (limited to 'src')
-rw-r--r--src/com/android/camera/Camera.java12
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();