Merge "SnapdragonCamera: Update the storage space status after remount SDcard"

2 files changed, 21 insertions, 0 deletions

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 677be80e5..97b8cf7aa 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -33,6 +33,7 @@
     <uses-permission android:name="android.permission.WRITE_MEDIA_STORAGE" />
     <uses-permission android:name="android.permission.WRITE_SETTINGS" />
     <uses-permission android:name="android.permission.WRITE_SYNC_SETTINGS" />
+    <uses-permission android:name="android.permission.MOUNT_UNMOUNT_FILESYSTEMS" />
 
     <supports-screens
         android:anyDensity="true"
diff --git a/src/com/android/camera/CameraActivity.java b/src/com/android/camera/CameraActivity.java
index 8968377e9..7ee538fda 100644
--- a/src/com/android/camera/CameraActivity.java
+++ b/src/com/android/camera/CameraActivity.java
@@ -308,6 +308,24 @@ public class CameraActivity extends Activity
                 }
             };
 
+    // update the status of storage space when SD card status changed.
+    private BroadcastReceiver mSDcardMountedReceiver = new BroadcastReceiver() {
+        @Override
+        public void onReceive(Context context, Intent intent) {
+            Log.d(TAG, "SDcard status changed, update storage space");
+            updateStorageSpaceAndHint();
+        }
+    };
+
+    private void registerSDcardMountedReceiver() {
+        // filter for SDcard status
+        IntentFilter filter = new IntentFilter(Intent.ACTION_MEDIA_MOUNTED);
+        filter.addAction(Intent.ACTION_MEDIA_SHARED);
+        filter.addAction(Intent.ACTION_MEDIA_UNMOUNTED);
+        filter.addDataScheme("file");
+        registerReceiver(mSDcardMountedReceiver, filter);
+    }
+
     // close activity when screen turns off
     private BroadcastReceiver mScreenOffReceiver = new BroadcastReceiver() {
         @Override
@@ -1522,6 +1540,7 @@ public class CameraActivity extends Activity
         int offset = lower * 10 / 100;
         SETTING_LIST_WIDTH_1 = lower / 2 + offset;
         SETTING_LIST_WIDTH_2 = lower / 2 - offset;
+        registerSDcardMountedReceiver();
     }
 
     private void setRotationAnimation() {
@@ -1656,6 +1675,7 @@ public class CameraActivity extends Activity
         }
         getContentResolver().unregisterContentObserver(mLocalImagesObserver);
         getContentResolver().unregisterContentObserver(mLocalVideosObserver);
+        unregisterReceiver(mSDcardMountedReceiver);
 
         super.onDestroy();
     }