Merge "Provide missing camera HAL 2.4 data" into gce-dev
diff --git a/guest/hals/camera/EmulatedCamera.cpp b/guest/hals/camera/EmulatedCamera.cpp
index 693ec63..81f7ef3 100755
--- a/guest/hals/camera/EmulatedCamera.cpp
+++ b/guest/hals/camera/EmulatedCamera.cpp
@@ -23,6 +23,8 @@
* API.
*/
+#include "guest/libs/platform_support/api_level_fixes.h"
+
#define LOG_NDEBUG 0
#define LOG_TAG "EmulatedCamera_Camera"
#include <cutils/log.h>
@@ -286,6 +288,12 @@
info->orientation = 0;
}
+#if VSOC_PLATFORM_SDK_AFTER(L_MR1)
+ info->resource_cost = 50;
+ info->conflicting_devices = NULL;
+ info->conflicting_devices_length = 0;
+#endif
+
return EmulatedBaseCamera::getCameraInfo(info);
}
diff --git a/guest/hals/camera/JpegCompressor.cpp b/guest/hals/camera/JpegCompressor.cpp
index d93e7ae..8ee069f 100644
--- a/guest/hals/camera/JpegCompressor.cpp
+++ b/guest/hals/camera/JpegCompressor.cpp
@@ -46,9 +46,11 @@
NV21JpegCompressor::NV21JpegCompressor()
{
- const char dlName[] = "/system/lib/hw/camera.gce_x86.jpeg.so";
if (mDl == NULL) {
- mDl = dlopen(dlName, RTLD_NOW);
+ mDl = dlopen("/vendor/lib/hw/camera.gce_x86.jpeg.so", RTLD_NOW);
+ }
+ if (mDl == NULL) {
+ mDl = dlopen("/system/lib/hw/camera.gce_x86.jpeg.so", RTLD_NOW);
}
assert(mDl != NULL);