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

* commit 'e134e81aa076acbd10551b3d39217e9d438b492d': camera2: Add missing whitebalance mapping.
2014-09-23 00:11:03 +00:00
parent 51fc9ea5cd 75192fb790
commit 52d62193d6
1 changed files with 2 additions and 0 deletions
--- 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;