commit 347dccbe1ed10ceec190af4d3797a197426f1caf
author Alan Newberger <alann@google.com> Wed Sep 24 17:19:25 2014 -0700
committer Alan Newberger <alann@google.com> Wed Sep 24 17:26:17 2014 -0700
tree f6724f67981d904dff536ffc7e8f803e0468b08c
parent 2631a15a37b890f4ee720c5a4bbe3e654524deb6

Ensure Camera doesn't attempt access of back camera on Nakasi

Bug: 17647004
Change-Id: I823f98cfdfcc7429b6acf98215e4a08787bc1bb9

src/com/android/camera/PhotoModule.java

diff --git a/src/com/android/camera/PhotoModule.java b/src/com/android/camera/PhotoModule.java
index 3360122..7afa915 100644
--- a/src/com/android/camera/PhotoModule.java
+++ b/src/com/android/camera/PhotoModule.java
@@ -1356,10 +1356,12 @@
             CameraCapabilities.FocusMode focusMode) {
         CameraCapabilities.Stringifier stringifier = mCameraCapabilities.getStringifier();
         SettingsManager settingsManager = mActivity.getSettingsManager();
-        settingsManager.set(mAppController.getCameraScope(), Keys.KEY_FLASH_MODE,
-                            stringifier.stringify(flashMode));
+        if (!CameraCapabilities.FlashMode.NO_FLASH.equals(flashMode)) {
+            settingsManager.set(mAppController.getCameraScope(), Keys.KEY_FLASH_MODE,
+                    stringifier.stringify(flashMode));
+        }
         settingsManager.set(mAppController.getCameraScope(), Keys.KEY_FOCUS_MODE,
-                            stringifier.stringify(focusMode));
+                stringifier.stringify(focusMode));
     }
 
     @Override