diff options
author | Linux Build Service Account <lnxbuild@quicinc.com> | 2017-12-21 03:09:16 -0800 |
---|---|---|
committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2017-12-21 03:09:16 -0800 |
commit | 2a758925b399981709e3a8f4e7b63e76f7ed1b4d (patch) | |
tree | 5559a25ef0a58968b9eb37eee73d28e27b1038ab | |
parent | d816712beadb0c288b058fcd8ed93fda2469e2a5 (diff) | |
parent | 5e13fa176e5c78290230e98cfb164c2a164bd8c1 (diff) | |
download | android_packages_apps_Snap-2a758925b399981709e3a8f4e7b63e76f7ed1b4d.tar.gz android_packages_apps_Snap-2a758925b399981709e3a8f4e7b63e76f7ed1b4d.tar.bz2 android_packages_apps_Snap-2a758925b399981709e3a8f4e7b63e76f7ed1b4d.zip |
Merge "SnapdragonCamera:Fix recording"
-rwxr-xr-x | src/com/android/camera/CaptureModule.java | 11 |
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; |