Merge "Camera: fix first launch api level logic" into pi-dev

This commit is contained in:
android-build-team Robot
2018-05-02 21:54:17 +00:00
committed by Android (Google) Code Review

View File

@@ -1157,6 +1157,9 @@ hidl_vec<hidl_string> CameraHidlTest::getCameraDeviceNames(sp<ICameraProvider> p
TEST_F(CameraHidlTest, noHal1AfterP) {
constexpr int32_t HAL1_PHASE_OUT_API_LEVEL = 28;
int32_t firstApiLevel = property_get_int32("ro.product.first_api_level", /*default*/-1);
if (firstApiLevel < 0) {
firstApiLevel = property_get_int32("ro.build.version.sdk", /*default*/-1);
}
ASSERT_GT(firstApiLevel, 0); // first_api_level must exist
if (firstApiLevel >= HAL1_PHASE_OUT_API_LEVEL) {