diff options
| author | Vladimir Petrov <vpetro@codeaurora.org> | 2014-06-05 12:58:42 +0300 |
|---|---|---|
| committer | Abhisek Devkota <ciwrl@cyanogenmod.com> | 2014-10-20 22:23:24 +0000 |
| commit | 3b8cbff3d26c504e63b82044a8a264868f0d0db9 (patch) | |
| tree | 2b644402550850431f401c247eeac2cc072541b0 | |
| parent | 5c1231caa69d7539baec2ac7c6c53ce3b834fbf6 (diff) | |
| download | android_packages_apps_Camera2-3b8cbff3d26c504e63b82044a8a264868f0d0db9.tar.gz android_packages_apps_Camera2-3b8cbff3d26c504e63b82044a8a264868f0d0db9.tar.bz2 android_packages_apps_Camera2-3b8cbff3d26c504e63b82044a8a264868f0d0db9.zip | |
Camera2: Fix ANR when switching camera during AF
- Check that 'mCameraDevice' is valid at beginning of
setCameraParameters(). This will avoid null pointer
exceptions at some cases, when setCameraParameters()
is called by focus manager after closing camera.
CRs-Fixed: 668405
Change-Id: Iff4b81e725db6db11cdc205512b0fec1f71f333d
| -rw-r--r-- | src/com/android/camera/PhotoModule.java | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/com/android/camera/PhotoModule.java b/src/com/android/camera/PhotoModule.java index ad0e310b3..e28e92833 100644 --- a/src/com/android/camera/PhotoModule.java +++ b/src/com/android/camera/PhotoModule.java @@ -2841,6 +2841,9 @@ public class PhotoModule // the subsets actually need updating. The PREFERENCE set needs extra // locking because the preference can be changed from GLThread as well. private void setCameraParameters(int updateSet) { + if (mCameraDevice == null) { + return; + } synchronized (mCameraDevice) { boolean doModeSwitch = false; |