diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2014-05-29 17:02:48 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2014-05-29 17:02:48 -0700 |
| commit | 6c97129aa46d783ffbf97faed96f5e66ca82aea4 (patch) | |
| tree | dcada562c35b0f1d11a9adb8d9405e962d238884 /src/com/android/camera/PhotoModule.java | |
| parent | e5e252a8cb65729918458e65bcee437816ccec0b (diff) | |
| parent | a1812375541cc45a243939f3b732ea5cf5114d3f (diff) | |
| download | android_packages_apps_Snap-6c97129aa46d783ffbf97faed96f5e66ca82aea4.tar.gz android_packages_apps_Snap-6c97129aa46d783ffbf97faed96f5e66ca82aea4.tar.bz2 android_packages_apps_Snap-6c97129aa46d783ffbf97faed96f5e66ca82aea4.zip | |
Merge "Camera: Do not continue with long shot if SD card is full"
Diffstat (limited to 'src/com/android/camera/PhotoModule.java')
| -rw-r--r-- | src/com/android/camera/PhotoModule.java | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/src/com/android/camera/PhotoModule.java b/src/com/android/camera/PhotoModule.java index bcb2ef7a8..dea25ced6 100644 --- a/src/com/android/camera/PhotoModule.java +++ b/src/com/android/camera/PhotoModule.java @@ -1766,6 +1766,13 @@ public class PhotoModule @Override public void onShutterButtonLongClick() { + // Do not take the picture if there is not enough storage. + if (mActivity.getStorageSpaceBytes() <= Storage.LOW_STORAGE_THRESHOLD_BYTES) { + Log.i(TAG, "Not enough space or storage not ready. remaining=" + + mActivity.getStorageSpaceBytes()); + return; + } + if ((null != mCameraDevice) && ((mCameraState == IDLE) || (mCameraState == FOCUSING))) { //Add on/off Menu for longshot String longshot_enable = mPreferences.getString( |