diff options
Diffstat (limited to 'src/com/android/camera/CaptureModule.java')
-rwxr-xr-x | src/com/android/camera/CaptureModule.java | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/src/com/android/camera/CaptureModule.java b/src/com/android/camera/CaptureModule.java index 3ab3d926d..bc01cbb7c 100755 --- a/src/com/android/camera/CaptureModule.java +++ b/src/com/android/camera/CaptureModule.java @@ -833,6 +833,8 @@ public class CaptureModule implements CameraModule, PhotoController, SettingsManager.KEY_STATS_VISUALIZER_VALUE); if (stats_visualizer != null) { updateStatsView(stats_visualizer,result); + } else { + mUI.updateAWBInfoVisibility(View.GONE); } } }; @@ -2501,6 +2503,7 @@ public class CaptureModule implements CameraModule, PhotoController, } else { enableShutterAndVideoOnUiThread(id); } + Log.d(TAG,"onShutterButtonRelease"); if (mSettingsManager.getSavePictureFormat() == SettingsManager.HEIF_FORMAT) { if (mHeifImage != null) { try { @@ -3118,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(); @@ -5180,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); } @@ -5702,6 +5711,7 @@ public class CaptureModule implements CameraModule, PhotoController, + mActivity.getStorageSpaceBytes()); return; } + Log.d(TAG,"onShutterButtonClick"); if (mIsRecordingVideo) { if (mUI.isShutterEnabled()) { |