From 7b2d8a380d3c2e1ab9771d9dc55ea268408874b0 Mon Sep 17 00:00:00 2001 From: sbrissen Date: Fri, 12 Dec 2014 15:36:31 -0500 Subject: kona: initial L bringup Change-Id: Ic2df78caff752a3bcff645283c13ea3299264bcf --- camera/Android.mk | 1 + camera/exynos_camera.c | 4 ++-- camera/exynos_camera.h | 2 +- kona-common.mk | 5 ++++- libsensors/sensors.cpp | 20 +++++++++++++------- .../frameworks/base/core/res/res/values/config.xml | 6 +++--- rootdir/fstab.smdk4x12 | 19 +++++++++---------- selinux/system.te | 14 +++++++------- selinux/wpa_supplicant.te | 2 +- 9 files changed, 41 insertions(+), 32 deletions(-) mode change 100644 => 100755 camera/Android.mk diff --git a/camera/Android.mk b/camera/Android.mk old mode 100644 new mode 100755 index ac54750..4a11cb1 --- a/camera/Android.mk +++ b/camera/Android.mk @@ -32,6 +32,7 @@ LOCAL_SRC_FILES := \ LOCAL_C_INCLUDES := \ $(LOCAL_PATH)/include \ + system/media/camera/include \ hardware/samsung/exynos4/hal/include LOCAL_SHARED_LIBRARIES := libutils libcutils liblog libcamera_client libhardware diff --git a/camera/exynos_camera.c b/camera/exynos_camera.c index f9a4b40..31b2740 100755 --- a/camera/exynos_camera.c +++ b/camera/exynos_camera.c @@ -2002,7 +2002,7 @@ int exynos_camera_preview(struct exynos_camera *exynos_camera) if (exynos_camera->preview_window != NULL && exynos_camera->gralloc != NULL) { exynos_camera->preview_window->dequeue_buffer(exynos_camera->preview_window, &window_buffer, &window_stride); - exynos_camera->gralloc->lock(exynos_camera->gralloc, *window_buffer, GRALLOC_USAGE_SW_WRITE_OFTEN, 0, 0, width, height, &window_data); + exynos_camera->gralloc->lock(exynos_camera->gralloc, *window_buffer, GRALLOC_USAGE_YUV_ADDR | GRALLOC_USAGE_SW_WRITE_OFTEN, 0, 0, width, height, &window_data); if (window_data == NULL) { ALOGE("%s: Unable to lock gralloc", __func__); @@ -3454,7 +3454,7 @@ int exynos_camera_set_preview_window(struct camera_device *dev, goto error; } - rc = w->set_usage(w, GRALLOC_USAGE_SW_WRITE_OFTEN); + rc = w->set_usage(w, GRALLOC_USAGE_CAMERA | GRALLOC_USAGE_HW_FIMC1 | GRALLOC_USAGE_EXTERNAL_DISP | GRALLOC_USAGE_SW_WRITE_OFTEN); if (rc) { ALOGE("%s: Unable to set usage", __func__); goto error; diff --git a/camera/exynos_camera.h b/camera/exynos_camera.h index d8933c4..49447a2 100755 --- a/camera/exynos_camera.h +++ b/camera/exynos_camera.h @@ -41,7 +41,7 @@ #define EXYNOS_CAMERA_CAPTURE_BUFFERS_COUNT 1 #define EXYNOS_CAMERA_PREVIEW_BUFFERS_COUNT 8 #define EXYNOS_CAMERA_RECORDING_BUFFERS_COUNT 6 -#define EXYNOS_CAMERA_GRALLOC_BUFFERS_COUNT 3 +#define EXYNOS_CAMERA_GRALLOC_BUFFERS_COUNT 6 #define EXYNOS_CAMERA_UNKNOWN_CAPTURE_MODE 167774080 diff --git a/kona-common.mk b/kona-common.mk index 57b36de..ccda303 100755 --- a/kona-common.mk +++ b/kona-common.mk @@ -31,7 +31,6 @@ PRODUCT_COPY_FILES += \ $(LOCAL_PATH)/rootdir/init.smdk4x12.usb.rc:root/init.smdk4x12.usb.rc \ $(LOCAL_PATH)/rootdir/ueventd.smdk4x12.rc:root/ueventd.smdk4x12.rc \ $(LOCAL_PATH)/rootdir/ueventd.smdk4x12.rc:recovery/root/ueventd.smdk4x12.rc \ - $(LOCAL_PATH)/rootdir/lpm.rc:root/lpm.rc \ $(LOCAL_PATH)/rootdir/fstab.smdk4x12:root/fstab.smdk4x12 # Packages @@ -49,6 +48,10 @@ PRODUCT_COPY_FILES += \ $(LOCAL_PATH)/configs/nvram_net.txt_murata:system/etc/wifi/nvram_net.txt_murata \ $(LOCAL_PATH)/configs/80mac:system/etc/init.d/80mac +# Charger + PRODUCT_PACKAGES += \ + charger_res_images + # Camera PRODUCT_PACKAGES += \ camera.smdk4x12 diff --git a/libsensors/sensors.cpp b/libsensors/sensors.cpp index 0de6888..25f8eb6 100644 --- a/libsensors/sensors.cpp +++ b/libsensors/sensors.cpp @@ -73,29 +73,35 @@ static const struct sensor_t sSensorList[] = { { "LIS3DH Acceleration Sensor", "STMicroelectronics", 1, SENSORS_ACCELERATION_HANDLE, - SENSOR_TYPE_ACCELEROMETER, RANGE_A, RESOLUTION_A, 0.20f, 10000, 0, 0, { } }, + SENSOR_TYPE_ACCELEROMETER, RANGE_A, RESOLUTION_A, 0.20f, 10000, 0, 0, + SENSOR_STRING_TYPE_ACCELEROMETER, "", 0, SENSOR_FLAG_CONTINUOUS_MODE, { } }, { "MS-3R (YAS532) Magnetic Sensor", "Yamaha Corporation", 1, SENSORS_MAGNETIC_FIELD_HANDLE, - SENSOR_TYPE_MAGNETIC_FIELD, 2000.0f, 0.06f, 6.8f, 10000, 0, 0, { } }, + SENSOR_TYPE_MAGNETIC_FIELD, 2000.0f, 0.06f, 6.8f, 10000, 0, 0, + SENSOR_STRING_TYPE_MAGNETIC_FIELD, "", 0, SENSOR_FLAG_CONTINUOUS_MODE, { } }, { "MS-x Orientation Sensor", "Yamaha Corporation", 1, SENSORS_ORIENTATION_HANDLE, - SENSOR_TYPE_ORIENTATION, 360.0f, CONVERT_O, 7.8f, 10000, 0, 0, { } }, + SENSOR_TYPE_ORIENTATION, 360.0f, CONVERT_O, 7.8f, 10000, 0, 0, + SENSOR_STRING_TYPE_ORIENTATION, "", 0, SENSOR_FLAG_CONTINUOUS_MODE, { } }, #ifndef ALS3201_SENSOR { "GP2AP030 Light sensor", "Sharp", 1, SENSORS_LIGHT_HANDLE, - SENSOR_TYPE_LIGHT, 10240.0f, 1.0f, 0.75f, 0, 0, 0, { } }, + SENSOR_TYPE_LIGHT, 10240.0f, 1.0f, 0.75f, 0, 0, 0, + SENSOR_STRING_TYPE_LIGHT, "", 0, SENSOR_FLAG_CONTINUOUS_MODE, { } }, { "GP2AP030 Proximity sensor", "Sharp", 1, SENSORS_PROXIMITY_HANDLE, - SENSOR_TYPE_PROXIMITY, 5.0f, 1.0f, 0.75f, 0, 0, 0, { } }, + SENSOR_TYPE_PROXIMITY, 5.0f, 1.0f, 0.75f, 0, 0, 0, + SENSOR_STRING_TYPE_PROXIMITY, "", 0, SENSOR_FLAG_WAKE_UP, { } }, #else { "AL3201 Light Sensor", "LITEON", 1, SENSORS_LIGHT_HANDLE, - SENSOR_TYPE_LIGHT, 10240.0f, 1.0f, 0.75f, 0, 0, 0, { } }, + SENSOR_TYPE_LIGHT, 10240.0f, 1.0f, 0.75f, 0, 0, 0, + SENSOR_STRING_TYPE_LIGHT, "", 0, SENSOR_FLAG_CONTINUOUS_MODE, { } }, #endif }; @@ -370,7 +376,7 @@ static int open_sensors(const struct hw_module_t* module, const char* id, memset(&dev->device, 0, sizeof(sensors_poll_device_t)); dev->device.common.tag = HARDWARE_DEVICE_TAG; - dev->device.common.version = 0; + dev->device.common.version = SENSORS_DEVICE_API_VERSION_1_0; dev->device.common.module = const_cast(module); dev->device.common.close = poll__close; dev->device.activate = poll__activate; diff --git a/overlay/frameworks/base/core/res/res/values/config.xml b/overlay/frameworks/base/core/res/res/values/config.xml index 2d596a9..25b8439 100755 --- a/overlay/frameworks/base/core/res/res/values/config.xml +++ b/overlay/frameworks/base/core/res/res/values/config.xml @@ -24,10 +24,10 @@ true - true + - true + true -1 @@ -78,7 +78,7 @@ - false +