OSDN Git Service
(root)
/
android-x86
/
packages-apps-Camera.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
6f86a07
)
Check if surface holder is null in initializeRecorder. do not merge
author
Wu-cheng Li
<wuchengli@google.com>
Fri, 12 Nov 2010 04:22:15 +0000
(12:22 +0800)
committer
Wu-cheng Li
<wuchengli@google.com>
Fri, 12 Nov 2010 05:24:30 +0000
(13:24 +0800)
If shutter button is pressed before surface changed,
surface holder can be null. Recording should be ignored.
bug:
3187885
Change-Id: I61406f3c44342db28f0ebeddc788d2d1d621fc1b
src/com/android/camera/VideoCamera.java
patch
|
blob
|
history
diff --git
a/src/com/android/camera/VideoCamera.java
b/src/com/android/camera/VideoCamera.java
index
0c0a6d9
..
48ffea6
100644
(file)
--- a/
src/com/android/camera/VideoCamera.java
+++ b/
src/com/android/camera/VideoCamera.java
@@
-931,6
+931,11
@@
public class VideoCamera extends NoSearchActivity
// If the mCameraDevice is null, then this activity is going to finish
if (mCameraDevice == null) return;
+ if (mSurfaceHolder == null) {
+ Log.v(TAG, "Surface holder is null. Wait for surface changed.");
+ return;
+ }
+
Intent intent = getIntent();
Bundle myExtras = intent.getExtras();