From 60c79455c579b0bc089b0d75c5b8fca4afa1a6c1 Mon Sep 17 00:00:00 2001
From: Jay Wang <jaywang@codeaurora.org>
Date: Fri, 25 Mar 2016 07:29:20 -0700
Subject: SnapdragonCamera: handle IllegalArgumentException while saving video

Handles the IllegalArgumentException caused by setDataSource()
while saving video. This exception indicates that the file path
is invalid.

CRs-Fixed: 993646
Change-Id: I0cbd496793246bfbbeac556203c0d43f122b4942
---
 src/com/android/camera/VideoModule.java | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'src/com')

diff --git a/src/com/android/camera/VideoModule.java b/src/com/android/camera/VideoModule.java
index 4724bd203..8797d0fd0 100644
--- a/src/com/android/camera/VideoModule.java
+++ b/src/com/android/camera/VideoModule.java
@@ -1657,12 +1657,13 @@ public class VideoModule implements CameraModule,
 
             long duration = 0L;
             MediaMetadataRetriever retriever = new MediaMetadataRetriever();
-            retriever.setDataSource(mCurrentVideoFilename);
+
             try {
+                retriever.setDataSource(mCurrentVideoFilename);
                 duration = Long.valueOf(retriever.extractMetadata(
                             MediaMetadataRetriever.METADATA_KEY_DURATION));
-            } catch (NumberFormatException e) {
-                Log.e(TAG, "cannot retrieve duration metadata");
+            } catch (IllegalArgumentException e) {
+                Log.e(TAG, "cannot access the file");
             }
             retriever.release();
 
-- 
cgit v1.2.3