Merge "Camera: Check file existence before update"

2 files changed, 17 insertions, 5 deletions

diff --git a/src/com/android/camera/data/CameraDataAdapter.java b/src/com/android/camera/data/CameraDataAdapter.java
index 99bde4181..5744d6b96 100644
--- a/src/com/android/camera/data/CameraDataAdapter.java
+++ b/src/com/android/camera/data/CameraDataAdapter.java
@@ -142,12 +142,16 @@ public class CameraDataAdapter implements LocalDataAdapter {
         }
         int pos = findDataByContentUri(uri);
         LocalMediaData.VideoData newData = LocalMediaData.VideoData.buildFromCursor(c);
-        if (pos != -1) {
-            // A duplicate one, just do a substitute.
-            updateData(pos, newData);
+        if (newData != null) {
+            if (pos != -1) {
+                // A duplicate one, just do a substitute.
+                updateData(pos, newData);
+            } else {
+                // A new data.
+                insertData(newData);
+            }
         } else {
-            // A new data.
-            insertData(newData);
+            Log.e(TAG, "video data not found");
         }
     }
 
diff --git a/src/com/android/camera/data/LocalMediaData.java b/src/com/android/camera/data/LocalMediaData.java
index 1f9c725d0..bb451fa0f 100644
--- a/src/com/android/camera/data/LocalMediaData.java
+++ b/src/com/android/camera/data/LocalMediaData.java
@@ -636,6 +636,14 @@ public abstract class LocalMediaData implements LocalData {
             int height = c.getInt(COL_HEIGHT);
             MediaMetadataRetriever retriever = new MediaMetadataRetriever();
             String rotation = null;
+
+            File origFile = new File(path);
+            if (!origFile.exists() || origFile.length() <= 0) {
+                Log.e(TAG, "Invalid video file");
+                retriever.release();
+                return null;
+            }
+
             try {
                 retriever.setDataSource(path);
             } catch (RuntimeException ex) {