commit 0468a4b27c5949528496c0ba7945de08bc501300
author Daniel Hung-yu Wu <hywu@google.com> Fri Mar 24 01:56:04 2017
committer chrome-bot <chrome-bot@chromium.org> Thu Apr 13 09:41:46 2017
tree 995471f71fa4d7fa0080a8d1a79a434dad45fe5e
parent 9a78a6d62f8fd8789ddcd61b1f72a8d5fff055d2

camera3_test: update capture result keys test

Update capture result keys test according to
camera2/cts/CaptureResultTest.java#testCameraCaptureResultAllKeys()

BUG=b/32689987
TEST='emerge-kevin arc-camera3-test'
     'arc_camera3_test --gtest_filter=*Camera3ResultAllKeys*'

Change-Id: Ice20bf7122ff62108866fa29d1a47b0d7eea22a6
Reviewed-on: https://chromium-review.googlesource.com/459157
Commit-Ready: Hung-yu Wu <hywu@chromium.org>
Tested-by: Hung-yu Wu <hywu@chromium.org>
Reviewed-by: Heng-ruey Hsu <henryhsu@chromium.org>

camera3_test/camera3_frame_test.cc

diff --git a/camera3_test/camera3_frame_test.cc b/camera3_test/camera3_frame_test.cc
index a676d24..1b18ac9 100644
--- a/camera3_test/camera3_frame_test.cc
+++ b/camera3_test/camera3_frame_test.cc
@@ -293,17 +293,7 @@
     waiver_keys->insert(ANDROID_SENSOR_NOISE_PROFILE);
   }
 
-  // Keys for depth output capability
-  if (!cam_device_.static_info_->IsCapabilitySupported(
-          ANDROID_REQUEST_AVAILABLE_CAPABILITIES_DEPTH_OUTPUT)) {
-    waiver_keys->insert(ANDROID_LENS_POSE_ROTATION);
-    waiver_keys->insert(ANDROID_LENS_POSE_TRANSLATION);
-    waiver_keys->insert(ANDROID_LENS_INTRINSIC_CALIBRATION);
-    waiver_keys->insert(ANDROID_LENS_RADIAL_DISTORTION);
-  }
-
   // TODO: CONTROL_AE_REGIONS, CONTROL_AWB_REGIONS, CONTROL_AF_REGIONS?
-  // TODO: SENSOR_DYNAMIC_BLACK_LEVEL, SENSOR_DYNAMIC_WHITE_LEVEL
 
   if (cam_device_.static_info_->IsHardwareLevelAtLeastFull()) {
     return;
@@ -344,20 +334,15 @@
   // Keys not required if neither MANUAL_SENSOR nor READ_SENSOR_SETTINGS is
   // supported
   if (!cam_device_.static_info_->IsCapabilitySupported(
-          ANDROID_REQUEST_AVAILABLE_CAPABILITIES_MANUAL_SENSOR) &&
-      !cam_device_.static_info_->IsCapabilitySupported(
-          ANDROID_REQUEST_AVAILABLE_CAPABILITIES_READ_SENSOR_SETTINGS)) {
-    waiver_keys->insert(ANDROID_SENSOR_EXPOSURE_TIME);
-    waiver_keys->insert(ANDROID_SENSOR_SENSITIVITY);
-    waiver_keys->insert(ANDROID_LENS_FOCUS_DISTANCE);
-    waiver_keys->insert(ANDROID_LENS_APERTURE);
-  }
-  if (!cam_device_.static_info_->IsCapabilitySupported(
           ANDROID_REQUEST_AVAILABLE_CAPABILITIES_MANUAL_SENSOR)) {
+    waiver_keys->insert(ANDROID_SENSOR_EXPOSURE_TIME);
     waiver_keys->insert(ANDROID_SENSOR_FRAME_DURATION);
+    waiver_keys->insert(ANDROID_SENSOR_SENSITIVITY);
     waiver_keys->insert(ANDROID_BLACK_LEVEL_LOCK);
     waiver_keys->insert(ANDROID_LENS_FOCUS_RANGE);
+    waiver_keys->insert(ANDROID_LENS_FOCUS_DISTANCE);
     waiver_keys->insert(ANDROID_LENS_STATE);
+    waiver_keys->insert(ANDROID_LENS_APERTURE);
     waiver_keys->insert(ANDROID_LENS_FILTER_DENSITY);
   }
 }