Snap: Handle SDCard-removed case

* When the storage path has been set to SDCard but the card has been
  removed, there is currently no way to alter the setting and to get your
  cam to work properly again
* Check the writeable-state of the sdcard on startup and fall back
  to using the internal storage in that case
* The startup-flag is used to keep the current behaviour with removed
  SDcards while cam is still active

* Fixes: https://gitlab.com/LineageOS/issues/android/issues/1376

Change-Id: Ib408883a6810693c93488f8a02fe061c56932d1d

1 files changed, 8 insertions, 0 deletions

diff --git a/src/com/android/camera/CameraActivity.java b/src/com/android/camera/CameraActivity.java
index 2933ed4e5..31edc9a5a 100755
--- a/src/com/android/camera/CameraActivity.java
+++ b/src/com/android/camera/CameraActivity.java
@@ -280,6 +280,8 @@ public class CameraActivity extends Activity
     private WakeLock mWakeLock;
     private static final int REFOCUS_ACTIVITY_CODE = 1;
 
+    private boolean mIsStartup = true;
+
     private class MyOrientationEventListener
             extends OrientationEventListener {
         public MyOrientationEventListener(Context context) {
@@ -2017,6 +2019,12 @@ public class CameraActivity extends Activity
     }
 
     protected void updateStorageSpaceAndHint() {
+        if (mIsStartup) {
+            if (!SDCard.instance().isWriteable()) {
+                Storage.setSaveSDCard(false);
+            }
+            mIsStartup = false;
+        }
         updateStorageSpace();
         updateStorageHint(mStorageSpaceBytes);
     }