diff options
| author | kaiyiz <kaiyiz@codeaurora.org> | 2014-08-26 14:28:36 +0800 |
|---|---|---|
| committer | Likai Ding <likaid@codeaurora.org> | 2014-10-15 14:15:16 +0800 |
| commit | 79f9c903907a91a41ec031db9ade539951980ab1 (patch) | |
| tree | fda659b9fe509dffba5658577fb3735a538fdb01 /src | |
| parent | d7810337255f08f3c89e2fb02ca393fc2997ca8d (diff) | |
| download | android_packages_apps_Snap-79f9c903907a91a41ec031db9ade539951980ab1.tar.gz android_packages_apps_Snap-79f9c903907a91a41ec031db9ade539951980ab1.tar.bz2 android_packages_apps_Snap-79f9c903907a91a41ec031db9ade539951980ab1.zip | |
Camera2: fix NPE happened when use key DPAD_LEFT or DPAD_RIGHT
mFocusManager maybe not initialize when use Key DPAD_LEFT or DPAD_RIGHT.
Check null before use it.
CRs-Fixed: 713558
Change-Id: I16b4c75853c6bfd390cf1a83c83abdf6c35113d0
Diffstat (limited to 'src')
| -rwxr-xr-x | src/com/android/camera/PhotoModule.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/com/android/camera/PhotoModule.java b/src/com/android/camera/PhotoModule.java index eee1110b1..c431222c5 100755 --- a/src/com/android/camera/PhotoModule.java +++ b/src/com/android/camera/PhotoModule.java @@ -2242,7 +2242,7 @@ public class PhotoModule } return true; case KeyEvent.KEYCODE_DPAD_LEFT: - if ( (mCameraState != PREVIEW_STOPPED) && + if ( (mCameraState != PREVIEW_STOPPED) && (mFocusManager != null) && (mFocusManager.getCurrentFocusState() != mFocusManager.STATE_FOCUSING) && (mFocusManager.getCurrentFocusState() != mFocusManager.STATE_FOCUSING_SNAP_ON_FINISH) ) { if (mbrightness > MINIMUM_BRIGHTNESS) { @@ -2260,7 +2260,7 @@ public class PhotoModule } break; case KeyEvent.KEYCODE_DPAD_RIGHT: - if ( (mCameraState != PREVIEW_STOPPED) && + if ( (mCameraState != PREVIEW_STOPPED) && (mFocusManager != null) && (mFocusManager.getCurrentFocusState() != mFocusManager.STATE_FOCUSING) && (mFocusManager.getCurrentFocusState() != mFocusManager.STATE_FOCUSING_SNAP_ON_FINISH) ) { if (mbrightness < MAXIMUM_BRIGHTNESS) { |