Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4fc8f508 authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Snap for 4509671 from 31b76438 to pi-release

Change-Id: I75bf2a0dc42efd0fbd3e0d01d4ed5fd44baee793
parents 9689ad9d 31b76438
Loading
Loading
Loading
Loading
+13 −0
Original line number Diff line number Diff line
@@ -1905,6 +1905,19 @@ TEST_F(CameraHidlTest, getCameraCharacteristics) {
                    // characteristics keys we've defined.
                    ASSERT_GT(entryCount, 0u);
                    ALOGI("getCameraCharacteristics metadata entry count is %zu", entryCount);

                    camera_metadata_ro_entry entry;
                    int retcode = find_camera_metadata_ro_entry(metadata,
                            ANDROID_INFO_SUPPORTED_HARDWARE_LEVEL, &entry);
                    if ((0 == retcode) && (entry.count > 0)) {
                        uint8_t hardwareLevel = entry.data.u8[0];
                        ASSERT_TRUE(
                                hardwareLevel == ANDROID_INFO_SUPPORTED_HARDWARE_LEVEL_LIMITED ||
                                hardwareLevel == ANDROID_INFO_SUPPORTED_HARDWARE_LEVEL_FULL ||
                                hardwareLevel == ANDROID_INFO_SUPPORTED_HARDWARE_LEVEL_3);
                    } else {
                        ADD_FAILURE() << "Get camera hardware level failed!";
                    }
                });
                ASSERT_TRUE(ret.isOk());
            }
+14 −0
Original line number Diff line number Diff line
LOCAL_PATH := $(call my-dir)

#######################################
# media_profiles_V1_0.dtd

include $(CLEAR_VARS)

LOCAL_MODULE := media_profiles_V1_0.dtd
LOCAL_SRC_FILES := media_profiles.dtd
LOCAL_MODULE_CLASS := ETC
LOCAL_MODULE_PATH := $(TARGET_OUT_ETC)

include $(BUILD_PREBUILT)