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:
d7aab18
)
Fix capture indicator on non-zsl modules.
author
Senpo Hu
<senpo@google.com>
Fri, 16 Jan 2015 22:13:42 +0000
(14:13 -0800)
committer
Senpo Hu
<senpo@google.com>
Fri, 16 Jan 2015 22:13:42 +0000
(14:13 -0800)
The logic is accidentally changed by ag/607738.
Let's revert it here.
Bug:
19022139
Change-Id: Idc6fd91ff5352a464bc128b367c54ba971b16b28
src/com/android/camera/CameraActivity.java
patch
|
blob
|
history
diff --git
a/src/com/android/camera/CameraActivity.java
b/src/com/android/camera/CameraActivity.java
index
ffd580b
..
9f62d66
100644
(file)
--- a/
src/com/android/camera/CameraActivity.java
+++ b/
src/com/android/camera/CameraActivity.java
@@
-1198,8
+1198,8
@@
public class CameraActivity extends QuickActivity
return;
}
- if (
data.getAttributes().isImage() ||
- data.getAttributes().isVideo() ||
+ if (
!data.getAttributes().isImage() &&
+ !data.getAttributes().isVideo() &&
!data.getAttributes().isRendering()) {
return;
}