diff options
| author | xianming wang <mingwax@codeaurora.org> | 2019-03-11 10:59:43 +0800 |
|---|---|---|
| committer | xianming wang <mingwax@codeaurora.org> | 2019-03-11 11:14:12 +0800 |
| commit | 7153517592731abd48321ffb2db603e80ba35291 (patch) | |
| tree | 98e4ac003b139642a846bb30a2c0e2759212e77f | |
| parent | fef611529a3685652002d63e7e760644768f4501 (diff) | |
| download | android_packages_apps_Snap-7153517592731abd48321ffb2db603e80ba35291.tar.gz android_packages_apps_Snap-7153517592731abd48321ffb2db603e80ba35291.tar.bz2 android_packages_apps_Snap-7153517592731abd48321ffb2db603e80ba35291.zip | |
SnapdragonCamera: Fix mCurrentSession NullPointer when stopRecording
Fix mCurrentSession NullPointerException when stopRecording call
abortCaptures.
CRs-Fixed: 2411251
Change-Id: I831d5eeb86219480aee4299eb681a94f83054fc8
| -rwxr-xr-x | src/com/android/camera/CaptureModule.java | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/com/android/camera/CaptureModule.java b/src/com/android/camera/CaptureModule.java index 213c44ce2..7c1413da7 100755 --- a/src/com/android/camera/CaptureModule.java +++ b/src/com/android/camera/CaptureModule.java @@ -5297,8 +5297,10 @@ public class CaptureModule implements CameraModule, PhotoController, mIsRecordingVideo = false; if (isEISDisable() && isAbortCapturesEnable()) { try { - mCurrentSession.abortCaptures(); - Log.d(TAG, "stopRecordingVideo call abortCaptures "); + if (mCurrentSession != null) { + mCurrentSession.abortCaptures(); + Log.d(TAG, "stopRecordingVideo call abortCaptures "); + } } catch (CameraAccessException e) { e.printStackTrace(); } catch (IllegalStateException e) { |