From e6ebf3d73bb3f337413bdde437fbb8fde6cee436 Mon Sep 17 00:00:00 2001
From: Andy Huibers <andyhuibers@google.com>
Date: Wed, 10 Sep 2014 21:08:56 -0700
Subject: [PATCH] If we are using CaptureModule for Gcam only, turn off flash.

Bug: 17460394

Change-Id: I4743e9c31f516d12537b2ceedc9e1fe35fbd8381
---
 src/com/android/camera/CaptureModule.java | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/com/android/camera/CaptureModule.java b/src/com/android/camera/CaptureModule.java
index 9c74d4d6c..07d779a35 100644
--- a/src/com/android/camera/CaptureModule.java
+++ b/src/com/android/camera/CaptureModule.java
@@ -665,6 +665,10 @@ public class CaptureModule extends CameraModule
         if (!mHdrEnabled) {
             bottomBarSpec.enableFlash = true;
         }
+        // Added to handle case of CaptureModule being used only for Gcam.
+        if (mStickyGcamCamera) {
+            bottomBarSpec.enableFlash = false;
+        }
         return bottomBarSpec;
     }
 
-- 
2.11.0