diff options
| author | junjiez <junjiez@codeaurora.org> | 2018-12-17 15:42:42 +0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2018-12-20 00:21:01 -0800 |
| commit | b8e3dadf7f5ed455212283ceed168e6acb2cbfec (patch) | |
| tree | 475b9641f165c482bc11b8a180f4fd890a6c7c5d /src/com/android/camera/CaptureModule.java | |
| parent | c48104739d7221ff3c617f34f2d6c63be5888288 (diff) | |
| download | android_packages_apps_Snap-b8e3dadf7f5ed455212283ceed168e6acb2cbfec.tar.gz android_packages_apps_Snap-b8e3dadf7f5ed455212283ceed168e6acb2cbfec.tar.bz2 android_packages_apps_Snap-b8e3dadf7f5ed455212283ceed168e6acb2cbfec.zip | |
SnapdraongCamera:Fix NullPointerException
Check if the session is null in
CameraCaptureSession.StateCallback
to avoid NP.
Change-Id: I0098857d4a368fecc7a633c75c85cb41277c168d
CRs-Fixed: 2364431
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 b2ebc34be..1e000916b 100755 --- a/src/com/android/camera/CaptureModule.java +++ b/src/com/android/camera/CaptureModule.java @@ -1501,7 +1501,8 @@ public class CaptureModule implements CameraModule, PhotoController, @Override public void onConfigured(CameraCaptureSession cameraCaptureSession) { - if (mPaused || null == mCameraDevice[id]) { + if (mPaused || null == mCameraDevice[id] || + cameraCaptureSession == null) { return; } Log.i(TAG, "cameracapturesession - onConfigured "+ id); |