Merge "Enable hidden api checks for camera cts tests."
diff --git a/tests/camera/AndroidTest.xml b/tests/camera/AndroidTest.xml
index 62124d1..f7ed872 100644
--- a/tests/camera/AndroidTest.xml
+++ b/tests/camera/AndroidTest.xml
@@ -39,7 +39,6 @@
single test class/method (device side) timeout value set by timeout
annotation -->
<option name="test-timeout" value="24000000" />
- <option name="hidden-api-checks" value="false" />
<option name="isolated-storage" value="false" />
</test>
</configuration>
diff --git a/tests/camera/src/android/hardware/multiprocess/camera/cts/Camera2Activity.java b/tests/camera/src/android/hardware/multiprocess/camera/cts/Camera2Activity.java
index 789626a..1be626a 100644
--- a/tests/camera/src/android/hardware/multiprocess/camera/cts/Camera2Activity.java
+++ b/tests/camera/src/android/hardware/multiprocess/camera/cts/Camera2Activity.java
@@ -63,8 +63,7 @@
" could not connect camera service");
return;
}
- // TODO: http://b/145308043 move this back to getCameraIdListNoLazy()
- String[] cameraIds = manager.getCameraIdList();
+ String[] cameraIds = manager.getCameraIdListNoLazy();
if (cameraIds == null || cameraIds.length == 0) {
mErrorServiceConnection.logAsync(TestConstants.EVENT_CAMERA_ERROR, TAG +
