From: Senpo Hu <senpo@google.com>
Date: Fri, 16 Jan 2015 22:13:42 +0000 (-0800)
Subject: Fix capture indicator on non-zsl modules.
X-Git-Tag: android-x86-6.0-r3~408^2
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=9c98680a61cc88592d96010b863c3e0adb9abbe1;p=android-x86%2Fpackages-apps-Camera2.git

Fix capture indicator on non-zsl modules.

The logic is accidentally changed by ag/607738.
Let's revert it here.

Bug: 19022139
Change-Id: Idc6fd91ff5352a464bc128b367c54ba971b16b28
---

diff --git a/src/com/android/camera/CameraActivity.java b/src/com/android/camera/CameraActivity.java
index ffd580b5b..9f62d66f5 100644
--- 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;
         }