Merge "SnapdraongCamera:Fix recording pause" into camera-SnapdragonCamera.lnx.2.0

1 files changed, 8 insertions, 2 deletions

diff --git a/src/com/android/camera/CaptureModule.java b/src/com/android/camera/CaptureModule.java
index 741b95253..d16f9ca96 100755
--- a/src/com/android/camera/CaptureModule.java
+++ b/src/com/android/camera/CaptureModule.java
@@ -3121,7 +3121,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();
@@ -5183,7 +5183,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);
         }