From 6bb719c84f7bc359bae05905aaffc571bdf6f056 Mon Sep 17 00:00:00 2001 From: junjiez Date: Fri, 15 Nov 2019 09:54:42 +0800 Subject: SnapdraongCamera:Fix recording pause Catch IllegalStateException when fails to pause video recording. Change-Id: Id1c4978db58bd040dd695313bf246202fd7357c7 CRs-Fixed: 2565211 --- src/com/android/camera/CaptureModule.java | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/com/android/camera/CaptureModule.java b/src/com/android/camera/CaptureModule.java index d4db0b771..6f5c8c8e7 100755 --- a/src/com/android/camera/CaptureModule.java +++ b/src/com/android/camera/CaptureModule.java @@ -3118,7 +3118,7 @@ public class CaptureModule implements CameraModule, PhotoController, } catch (InterruptedException e) { mCameraOpenCloseLock.release(); throw new RuntimeException("Interrupted while trying to lock camera closing.", e); - } catch (CameraAccessException e) { + } catch (CameraAccessException | IllegalStateException e) { e.printStackTrace(); } finally { mCameraOpenCloseLock.release(); @@ -5180,7 +5180,13 @@ public class CaptureModule implements CameraModule, PhotoController, boolean noNeedEndOfStreamInHFR = mHighSpeedCapture && ((int)mHighSpeedFPSRange.getUpper() >= HIGH_SESSION_MAX_FPS); if (noNeedEndofStreamWhenPause || noNeedEndOfStreamInHFR) { - mMediaRecorder.pause(); + try{ + mMediaRecorder.pause(); + } catch (IllegalStateException e){ + e.printStackTrace(); + mMediaRecorderPausing = false; + } + } else { setEndOfStream(false, false); } -- cgit v1.2.3