diff options
| author | Chih-Chung Chang <chihchung@google.com> | 2009-06-18 10:56:41 +0800 |
|---|---|---|
| committer | Chih-Chung Chang <chihchung@google.com> | 2009-06-18 10:56:41 +0800 |
| commit | 4fc134dffebaddec5bcdb26dc1caeb4ab6f7f91c (patch) | |
| tree | 859d3bbdacf989e82dc0a34eb32f67023180c392 /src/com/android | |
| parent | 1a87df74d96d711b282e2bfd9bbb13cf29ba31fc (diff) | |
| download | LegacyCamera-4fc134dffebaddec5bcdb26dc1caeb4ab6f7f91c.zip LegacyCamera-4fc134dffebaddec5bcdb26dc1caeb4ab6f7f91c.tar.gz LegacyCamera-4fc134dffebaddec5bcdb26dc1caeb4ab6f7f91c.tar.bz2 | |
Try to fix 1917822.
Make sure we have a surface in the holder before proceeding.
Diffstat (limited to 'src/com/android')
| -rw-r--r-- | src/com/android/camera/Camera.java | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/com/android/camera/Camera.java b/src/com/android/camera/Camera.java index e4f39dc..548d0ca 100644 --- a/src/com/android/camera/Camera.java +++ b/src/com/android/camera/Camera.java @@ -1369,6 +1369,12 @@ public class Camera extends Activity implements View.OnClickListener, } public void surfaceChanged(SurfaceHolder holder, int format, int w, int h) { + // Make sure we have a surface in the holder before proceeding. + if (holder.getSurface() == null) { + Log.d(TAG, "holder.getSurface() == null"); + return; + } + mSurfaceHolder = holder; mViewFinderWidth = w; mViewFinderHeight = h; |