diff options
| author | Wu-cheng Li <wuchengli@google.com> | 2011-09-19 16:49:10 +0800 |
|---|---|---|
| committer | Wu-cheng Li <wuchengli@google.com> | 2011-09-19 16:49:10 +0800 |
| commit | 93fd3bcfa06ef1f525dced9e125ed6541071a865 (patch) | |
| tree | 3d332774034248dcf448e0ff43777d90b7fc19e2 /src/com/android/camera/Camera.java | |
| parent | 440bb1665b8288a6e94340d1f37b5b3e6bc0e79c (diff) | |
| download | LegacyCamera-93fd3bcfa06ef1f525dced9e125ed6541071a865.zip LegacyCamera-93fd3bcfa06ef1f525dced9e125ed6541071a865.tar.gz LegacyCamera-93fd3bcfa06ef1f525dced9e125ed6541071a865.tar.bz2 | |
Fix NPE in onTouch if camera fails to open.
If the camera fails to open in onResume, it is possible
to have a null mCameraDevice in onTouch.
bug:5332896
Change-Id: Ia357d4aa23a99eabcd641ec65811d34372ce973f
Diffstat (limited to 'src/com/android/camera/Camera.java')
| -rw-r--r-- | src/com/android/camera/Camera.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/com/android/camera/Camera.java b/src/com/android/camera/Camera.java index 8973bac..6e3502a 100644 --- a/src/com/android/camera/Camera.java +++ b/src/com/android/camera/Camera.java @@ -1342,7 +1342,8 @@ public class Camera extends ActivityBase implements FocusManager.Listener, // Preview area is touched. Handle touch focus. @Override public boolean onTouch(View v, MotionEvent e) { - if (mPausing || !mFirstTimeInitialized || mCameraState == SNAPSHOT_IN_PROGRESS) { + if (mPausing || mCameraDevice == null || !mFirstTimeInitialized + || mCameraState == SNAPSHOT_IN_PROGRESS) { return false; } |