diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2019-04-18 07:03:24 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2019-04-18 07:03:25 -0700 |
| commit | 2697306d70e022c82063b30e46bbcd2a4ecc75de (patch) | |
| tree | 42edf179a6b46ac752d8267c1cdef6c41c498114 | |
| parent | 7153517592731abd48321ffb2db603e80ba35291 (diff) | |
| parent | 57d89ef3d5e7702920a99e700ce4c7c7e92db203 (diff) | |
| download | android_packages_apps_Snap-2697306d70e022c82063b30e46bbcd2a4ecc75de.tar.gz android_packages_apps_Snap-2697306d70e022c82063b30e46bbcd2a4ecc75de.tar.bz2 android_packages_apps_Snap-2697306d70e022c82063b30e46bbcd2a4ecc75de.zip | |
Merge "Checking session is not null before call abortCapture" into camera-SnapdragonCamera.lnx.2.0
| -rwxr-xr-x | src/com/android/camera/CaptureModule.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/com/android/camera/CaptureModule.java b/src/com/android/camera/CaptureModule.java index 7c1413da7..014f72053 100755 --- a/src/com/android/camera/CaptureModule.java +++ b/src/com/android/camera/CaptureModule.java @@ -4664,7 +4664,7 @@ public class CaptureModule implements CameraModule, PhotoController, mUI.clearFocus(); mUI.hideUIwhileRecording(); mCameraHandler.removeMessages(CANCEL_TOUCH_FOCUS, mCameraId[cameraId]); - if (isAbortCapturesEnable()) { + if (isAbortCapturesEnable() && mCaptureSession[cameraId] != null) { mCaptureSession[cameraId].abortCaptures(); Log.d(TAG, "startRecordingVideo call abortCaptures befor close preview "); } @@ -5295,7 +5295,7 @@ public class CaptureModule implements CameraModule, PhotoController, mLiveShotInitHeifWriter.close(); } mIsRecordingVideo = false; - if (isEISDisable() && isAbortCapturesEnable()) { + if (isEISDisable() && isAbortCapturesEnable() && mCurrentSession != null) { try { if (mCurrentSession != null) { mCurrentSession.abortCaptures(); |