commit 7f3ce00606aa3b889786d9dec9ce8526ff25fc2a
author Zhijun He <zhijunhe@google.com> Thu Jul 18 17:01:57 2013 -0700
committer Zhijun He <zhijunhe@google.com> Thu Jul 18 17:12:48 2013 -0700
tree 347c026bb9b16e8de4e6d4dd8a2c003168dca0ea
parent e68b3520f00e9b81264f83588742c33a48bee9e7

Camera2Test: fix build break due to metadata change

Change-Id: I1b81f14fe0f093a7d29d0b0facdb1886d521d256

tests/camera2/CameraBurstTests.cpp

diff --git a/tests/camera2/CameraBurstTests.cpp b/tests/camera2/CameraBurstTests.cpp
index b71cfd1..cf8f68a 100644
--- a/tests/camera2/CameraBurstTests.cpp
+++ b/tests/camera2/CameraBurstTests.cpp
@@ -356,19 +356,22 @@
             minExp << " - " << maxExp << " ns " << std::endl;
 
     {
-        camera_metadata_ro_entry availableSensitivities =
-            GetStaticEntry(ANDROID_SENSOR_INFO_AVAILABLE_SENSITIVITIES);
-
-        EXPECT_LT(0u, availableSensitivities.count) << "No sensitivities listed."
+        camera_metadata_ro_entry sensivityRange =
+            GetStaticEntry(ANDROID_SENSOR_INFO_SENSITIVITY_RANGE);
+        EXPECT_EQ(2u, sensivityRange.count) << "No sensitivity range listed."
                 "Falling back to default set.";
-        sensitivities.appendArray(availableSensitivities.data.i32,
-                availableSensitivities.count);
-        if (availableSensitivities.count == 0) {
-            sensitivities.push_back(100);
-            sensitivities.push_back(200);
-            sensitivities.push_back(400);
-            sensitivities.push_back(800);
+        int32_t minSensitivity = 100;
+        int32_t maxSensitivity = 800;
+        if (sensivityRange.count >= 2) {
+            minSensitivity = sensivityRange.data.i32[0];
+            maxSensitivity = sensivityRange.data.i32[1];
         }
+        int32_t count = (maxSensitivity - minSensitivity + 99) / 100;
+        sensitivities.push_back(minSensitivity);
+        for (int i = 1; i < count; i++) {
+            sensitivities.push_back(minSensitivity + i * 100);
+        }
+        sensitivities.push_back(maxSensitivity);
     }
 
     dout << "Available sensitivities: ";