commit b8ba9ca1fc891b41b440bafce03bfd2dbaee1488
author huans <huans@google.com> Fri Oct 27 15:46:16 2017 -0700
committer huans <huans@google.com> Tue Jan 30 16:00:40 2018 -0800
tree 851a10ca81fe41a90aa9f7b4b3f630259b04bf37
parent 594e11e870824aa1dfa01ae3a29a6d3edb4b0ade

Set android.colorCorrection.aberrationMode HIGH_QUALITY for still
template

Bug: 68388189
Test: run cts -m CameraTestCases -t
android.hardware.camera2.cts.CameraDeviceTest#testCameraDeviceStillTemplate

Change-Id: I64f8bf68401c4cc6b0b3c9f9b54d3a5b8ba407f5

camera/EmulatedFakeCamera3.cpp

diff --git a/camera/EmulatedFakeCamera3.cpp b/camera/EmulatedFakeCamera3.cpp
index b21d5f7..37747da 100644
--- a/camera/EmulatedFakeCamera3.cpp
+++ b/camera/EmulatedFakeCamera3.cpp
@@ -715,7 +715,10 @@
         static const uint8_t lensShadingMapMode = ANDROID_STATISTICS_LENS_SHADING_MAP_MODE_OFF;
         settings.update(ANDROID_STATISTICS_LENS_SHADING_MAP_MODE, &lensShadingMapMode, 1);
 
-        static const uint8_t aberrationMode = ANDROID_COLOR_CORRECTION_ABERRATION_MODE_FAST;
+        uint8_t aberrationMode = ANDROID_COLOR_CORRECTION_ABERRATION_MODE_FAST;
+        if (type == CAMERA3_TEMPLATE_STILL_CAPTURE) {
+            aberrationMode = ANDROID_COLOR_CORRECTION_ABERRATION_MODE_HIGH_QUALITY;
+        }
         settings.update(ANDROID_COLOR_CORRECTION_ABERRATION_MODE, &aberrationMode, 1);
 
         static const int32_t testPatternMode = ANDROID_SENSOR_TEST_PATTERN_MODE_OFF;