diff options
| author | Abhijit Trivedi <abhijitt@quicinc.com> | 2018-12-19 13:47:12 -0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2018-12-19 13:47:12 -0800 |
| commit | 79981a1b2160fc7249f0c900a490bbf083d5556c (patch) | |
| tree | a46766bec24f7ae8b7179486104d5986438ef997 /src/com/android/camera/CaptureModule.java | |
| parent | 407ac280645f0d250f85b66c956840e7178a10d1 (diff) | |
| parent | eb75ab74bf835896eec7882a08db10154efb0777 (diff) | |
| download | android_packages_apps_Snap-79981a1b2160fc7249f0c900a490bbf083d5556c.tar.gz android_packages_apps_Snap-79981a1b2160fc7249f0c900a490bbf083d5556c.tar.bz2 android_packages_apps_Snap-79981a1b2160fc7249f0c900a490bbf083d5556c.zip | |
Merge "fix force close when TAF before session configed" into camera-SnapdragonCamera.lnx.2.0
Diffstat (limited to 'src/com/android/camera/CaptureModule.java')
| -rwxr-xr-x | src/com/android/camera/CaptureModule.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/com/android/camera/CaptureModule.java b/src/com/android/camera/CaptureModule.java index 26879ac82..d819634fb 100755 --- a/src/com/android/camera/CaptureModule.java +++ b/src/com/android/camera/CaptureModule.java @@ -3847,7 +3847,8 @@ public class CaptureModule implements CameraModule, PhotoController, @Override public void onSingleTapUp(View view, int x, int y) { if (mPaused || !mCamerasOpened || !mFirstTimeInitialized || !mAutoFocusRegionSupported - || !mAutoExposureRegionSupported || !isTouchToFocusAllowed()) { + || !mAutoExposureRegionSupported || !isTouchToFocusAllowed() + || mCaptureSession[getMainCameraId()] == null) { return; } if (DEBUG) { |