OSDN Git Service
(root)
/
android-x86
/
packages-apps-Camera2.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
70c8b95
)
Prevent VideoModule from freezing forever without triggering ANR.
author
Erin Dahlgren
<edahlgren@google.com>
Wed, 12 Mar 2014 23:31:12 +0000
(16:31 -0700)
committer
Erin Dahlgren
<edahlgren@google.com>
Wed, 12 Mar 2014 23:31:12 +0000
(16:31 -0700)
Bug:
13330215
Change-Id: I76a2c758c2e16454feebfed8b20fa0c967eda2cf
src/com/android/camera/VideoModule.java
patch
|
blob
|
history
diff --git
a/src/com/android/camera/VideoModule.java
b/src/com/android/camera/VideoModule.java
index
d07522c
..
11c4edf
100644
(file)
--- a/
src/com/android/camera/VideoModule.java
+++ b/
src/com/android/camera/VideoModule.java
@@
-376,7
+376,7
@@
public class VideoModule extends CameraModule
@Override
public void onSingleTapUp(View view, int x, int y) {
- if (mPaused || mCameraDevice == null) {
+ if (m
MediaRecorderRecording || m
Paused || mCameraDevice == null) {
return;
}
// Check if metering area or focus area is supported.