summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorjunjiez <junjiez@codeaurora.org>2017-12-14 13:26:52 +0800
committerjunjiez <junjiez@codeaurora.org>2017-12-21 10:19:54 +0800
commit5e13fa176e5c78290230e98cfb164c2a164bd8c1 (patch)
treea048f6b9857541d25e7d90405e7fc05f7ade842b /src
parent7e1395551d76b3cd4f34c5e2b216b7c0dceef150 (diff)
downloadandroid_packages_apps_Snap-5e13fa176e5c78290230e98cfb164c2a164bd8c1.tar.gz
android_packages_apps_Snap-5e13fa176e5c78290230e98cfb164c2a164bd8c1.tar.bz2
android_packages_apps_Snap-5e13fa176e5c78290230e98cfb164c2a164bd8c1.zip
SnapdragonCamera:Fix recording
If the surface of mediaRecorder is not valid, catch the exception when create session to avoid FC CRs-Fixed: 2158245 Change-Id: I031d06f49129b34f0378f863a630be91c222c25e
Diffstat (limited to 'src')
-rwxr-xr-xsrc/com/android/camera/CaptureModule.java11
1 files changed, 11 insertions, 0 deletions
diff --git a/src/com/android/camera/CaptureModule.java b/src/com/android/camera/CaptureModule.java
index 62e5bfa13..4fa1de0ea 100755
--- a/src/com/android/camera/CaptureModule.java
+++ b/src/com/android/camera/CaptureModule.java
@@ -3367,6 +3367,17 @@ public class CaptureModule implements CameraModule, PhotoController,
e.printStackTrace();
} catch (IOException e) {
e.printStackTrace();
+ } catch (IllegalArgumentException e) {
+ //surface of mediaRecorder is not valid
+ Toast.makeText(mActivity,"Could not start media recorder.\n " +
+ "Can't start video recording.", Toast.LENGTH_LONG).show();
+ releaseMediaRecorder();
+ releaseAudioFocus();
+ mStartRecPending = false;
+ mIsRecordingVideo = false;
+ mUI.showUIafterRecording();
+ mFrameProcessor.setVideoOutputSurface(null);
+ restartSession(true);
}
mStartRecPending = false;
return true;