summaryrefslogtreecommitdiffstats
path: root/src/com/android/camera
diff options
context:
space:
mode:
authorCamera Software Integration <camswint@localhost>2016-06-20 01:40:10 -0700
committerGerrit - the friendly Code Review server <code-review@localhost>2016-06-20 01:40:10 -0700
commitf108f6243de9869ee43a6d2c2a7a1476abd137ab (patch)
tree2e59e3bcc6882a626a5ebcc8c01574e3f7bb618d /src/com/android/camera
parent5d74366ed706960447cb334f543af6f9a1c6f596 (diff)
parentd691d29b1d91e7150146c22d52cbf5fc83bc6c63 (diff)
downloadandroid_packages_apps_Snap-f108f6243de9869ee43a6d2c2a7a1476abd137ab.tar.gz
android_packages_apps_Snap-f108f6243de9869ee43a6d2c2a7a1476abd137ab.tar.bz2
android_packages_apps_Snap-f108f6243de9869ee43a6d2c2a7a1476abd137ab.zip
Merge "SnapdragonCamera: Fix picture saved when no sdcard inserted" into camera.lnx.1.0-dev.1.0
Diffstat (limited to 'src/com/android/camera')
-rw-r--r--src/com/android/camera/CaptureModule.java6
1 files changed, 6 insertions, 0 deletions
diff --git a/src/com/android/camera/CaptureModule.java b/src/com/android/camera/CaptureModule.java
index c053655f5..36f787be4 100644
--- a/src/com/android/camera/CaptureModule.java
+++ b/src/com/android/camera/CaptureModule.java
@@ -1762,6 +1762,12 @@ public class CaptureModule implements CameraModule, PhotoController,
@Override
public void onShutterButtonClick() {
+ if (mActivity.getStorageSpaceBytes() <= Storage.LOW_STORAGE_THRESHOLD_BYTES) {
+ Log.i(TAG, "Not enough space or storage not ready. remaining="
+ + mActivity.getStorageSpaceBytes());
+ return;
+ }
+
String timer = mSettingsManager.getValue(SettingsManager.KEY_TIMER);
int seconds = Integer.parseInt(timer);