commit 75192fb7900ba00f7adbe25212e0800d6d61481e
author Ruben Brunk <rubenbrunk@google.com> Tue Sep 23 00:03:49 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Tue Sep 23 00:03:49 2014 +0000
tree 97f22ed2d407eb217ac2685163485accaff3e6fc
parent 60004caeba750c49aa258056e57ada898a086fc0
parent 9343c3cb7f624b7b230f460d17343c4d9e65e19e

am 4b3c7f85: Merge "camera2: Add missing whitebalance mapping." into lmp-dev

* commit '4b3c7f852a22c27bc31c3710c631ef5fae10788f':
  camera2: Add missing whitebalance mapping.

core/java/android/hardware/camera2/legacy/LegacyRequestMapper.java

diff --git a/core/java/android/hardware/camera2/legacy/LegacyRequestMapper.java b/core/java/android/hardware/camera2/legacy/LegacyRequestMapper.java
index 72d2d81..61f7b8b 100644
--- a/core/java/android/hardware/camera2/legacy/LegacyRequestMapper.java
+++ b/core/java/android/hardware/camera2/legacy/LegacyRequestMapper.java
@@ -648,6 +648,8 @@
                 return Camera.Parameters.WHITE_BALANCE_CLOUDY_DAYLIGHT;
             case CONTROL_AWB_MODE_TWILIGHT:
                 return Camera.Parameters.WHITE_BALANCE_TWILIGHT;
+            case CONTROL_AWB_MODE_SHADE:
+                return Parameters.WHITE_BALANCE_SHADE;
             default:
                 Log.w(TAG, "convertAwbModeToLegacy - unrecognized control.awbMode" + mode);
                 return Camera.Parameters.WHITE_BALANCE_AUTO;