diff options
| author | Ruben Brunk <rubenbrunk@google.com> | 2014-09-22 23:57:19 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-09-22 23:57:20 +0000 |
| commit | 9343c3cb7f624b7b230f460d17343c4d9e65e19e (patch) | |
| tree | ab69b5cddeb736e4c65b5baa2ed3379fc53af109 | |
| parent | 53b5cc87735cea92b3b3c5cb7215846bfb5ddf1d (diff) | |
| parent | 72a23d7b50afe2c2eba999da718864dce79f44bd (diff) | |
| download | frameworks_base-9343c3cb7f624b7b230f460d17343c4d9e65e19e.zip frameworks_base-9343c3cb7f624b7b230f460d17343c4d9e65e19e.tar.gz frameworks_base-9343c3cb7f624b7b230f460d17343c4d9e65e19e.tar.bz2 | |
Merge "camera2: Add missing whitebalance mapping." into lmp-dev
| -rw-r--r-- | core/java/android/hardware/camera2/legacy/LegacyRequestMapper.java | 2 |
1 files changed, 2 insertions, 0 deletions
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 @@ public class LegacyRequestMapper { 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; |