diff options
| author | likaid <likaid@codeaurora.org> | 2015-02-05 18:17:42 +0800 |
|---|---|---|
| committer | Likai Ding <likaid@codeaurora.org> | 2015-02-09 13:53:05 +0800 |
| commit | 61acac0af66000c914c138d4f759ec33b15b96ff (patch) | |
| tree | 7f854f3d4ef03ebc4008cbdb0000c9df87ed0d67 /src/com/android/camera/AndroidCameraManagerImpl.java | |
| parent | 926948487fb81d0971c359e2cd7a4b02a0741403 (diff) | |
| download | android_packages_apps_Snap-61acac0af66000c914c138d4f759ec33b15b96ff.tar.gz android_packages_apps_Snap-61acac0af66000c914c138d4f759ec33b15b96ff.tar.bz2 android_packages_apps_Snap-61acac0af66000c914c138d4f759ec33b15b96ff.zip | |
SnapdragonCamera: Fix null pointer exception during monkey test
CRs-Fixed: 788421 788422 788437 788445
Change-Id: Ie77a53a73182b6642ce2e9f7de7c4c127e192f51
Diffstat (limited to 'src/com/android/camera/AndroidCameraManagerImpl.java')
| -rw-r--r-- | src/com/android/camera/AndroidCameraManagerImpl.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/com/android/camera/AndroidCameraManagerImpl.java b/src/com/android/camera/AndroidCameraManagerImpl.java index 637a5f5c5..408bf4f55 100644 --- a/src/com/android/camera/AndroidCameraManagerImpl.java +++ b/src/com/android/camera/AndroidCameraManagerImpl.java @@ -774,7 +774,7 @@ class AndroidCameraManagerImpl implements CameraManager { mHandler.post(new Runnable() { @Override public void run() { - if (currentCamera.equals(mCamera.getCamera())) { + if (currentCamera != null && currentCamera.equals(mCamera.getCamera())) { mCallback.onPictureTaken(data, mCamera); } } |