kona: initial L bringup

Change-Id: Ic2df78caff752a3bcff645283c13ea3299264bcf

9 files changed, 41 insertions, 32 deletions

diff --git a/camera/Android.mk b/camera/Android.mk
index ac54750..4a11cb1 100644..100755
--- 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<hw_module_t*>(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 @@
     <bool name="config_disableMenuKeyInLockScreen">true</bool>
 
     <!-- Workaround for devices with broken keyboards -->
-    <bool name="config_forceDisableHardwareKeyboard">true</bool>
+    <!--<bool name="config_forceDisableHardwareKeyboard">true</bool>-->
 
     <!-- Boolean to enable stylus gestures -->
-    <bool name="config_stylusGestures">true</bool>
+    <!--<bool name="config_stylusGestures">true</bool>-->
     
    <bool name="config_allowAllRotations">true</bool>
    <integer name="config_lidOpenRotation">-1</integer>
@@ -78,7 +78,7 @@
     <!--<bool name="config_enableIrdaManagerService">true</bool>-->
     
     <!-- Device supports LED flashlight -->
-    <bool name="config_enableTorch">false</bool>
+    <!--<bool name="config_enableTorch">false</bool>-->
 
     <!-- Hardware 'face' keys present on the device, stored as a bit field.
          This integer should equal the sum of the corresponding value for each
diff --git a/rootdir/fstab.smdk4x12 b/rootdir/fstab.smdk4x12
index cb42467..801636e 100755
--- a/rootdir/fstab.smdk4x12
+++ b/rootdir/fstab.smdk4x12
@@ -3,17 +3,16 @@
 # The filesystem that contains the filesystem checker binary (typically /system) cannot
 # specify MF_CHECK, and must come before any filesystems that do specify MF_CHECK
 # data partition must be located at the bottom for supporting device encryption
-/dev/block/mmcblk0p9    /system             ext4      ro,errors=panic                                                                   wait
-/dev/block/mmcblk0p3    /efs                ext4      nosuid,nodev,noatime,noauto_da_alloc,discard,journal_async_commit,errors=panic    wait,check
-/dev/block/mmcblk0p8    /cache              ext4      nosuid,nodev,noatime,noauto_da_alloc,discard,journal_async_commit,errors=panic    wait,check
-/dev/block/mmcblk0p12   /data               ext4      nosuid,nodev,noatime,noauto_da_alloc,discard,journal_async_commit,errors=panic    wait,check,encryptable=footer
+/dev/block/platform/dw_mmc/by-name/SYSTEM    /system             ext4      ro,errors=panic                                                                   wait
+/dev/block/platform/dw_mmc/by-name/EFS       /efs                ext4      nosuid,nodev,noatime,noauto_da_alloc,discard,journal_async_commit,errors=panic    wait,check
+/dev/block/platform/dw_mmc/by-name/CACHE     /cache              ext4      nosuid,nodev,noatime,noauto_da_alloc,discard,journal_async_commit,errors=panic    wait,check
+/dev/block/platform/dw_mmc/by-name/USERDATA  /data               ext4      nosuid,nodev,noatime,noauto_da_alloc,discard,journal_async_commit,errors=panic    wait,check,encryptable=footer
 
 # vold-managed volumes ("block device" is actually a sysfs devpath)  
-/devices/platform/s3c-sdhci.2/mmc_host/mmc1     auto        auto        defaults    voldmanaged=sdcard1:auto
-/devices/platform/s5p-ehci                      auto       auto        defaults    voldmanaged=usbdisk0:auto
+/devices/platform/s3c-sdhci.2/mmc_host/mmc1*     auto        auto        defaults    voldmanaged=sdcard1:auto
+/devices/platform/s5p-ehci*                      auto       auto        defaults    voldmanaged=usbdisk0:auto
 
 # recovery
-/dev/block/mmcblk0p5                            /boot                   emmc        defaults    recoveryonly
-/dev/block/mmcblk0p6                            /recovery               emmc        defaults    recoveryonly
-/dev/block/mmcblk0p7                            /modem                  emmc        defaults    recoveryonly
-/dev/block/mmcblk1p1                            /external_sd            auto        defaults    recoveryonly
\ No newline at end of file
+/dev/block/platform/dw_mmc/by-name/BOOT                            /boot                   emmc        defaults    recoveryonly
+/dev/block/platform/dw_mmc/by-name/RECOVERY                        /recovery               emmc        defaults    recoveryonly
+/dev/block/platform/dw_mmc/by-name/RADIO                           /modem                  emmc        defaults    recoveryonly
diff --git a/selinux/system.te b/selinux/system.te
index 03637ab..1160fd7 100755
--- a/selinux/system.te
+++ b/selinux/system.te
@@ -1,11 +1,11 @@
 # Talk to qmuxd
-qmux_socket(system)
+qmux_socket(system_server)
 
-allow system diagnostic_device:chr_file rw_file_perms;
-allow system sensors_device:chr_file { read open };
-allow system sensors_data_file:file r_file_perms;
-allow system wpa_socket:unix_dgram_socket sendto;
+allow system_server diagnostic_device:chr_file rw_file_perms;
+allow system_server sensors_device:chr_file { read open };
+allow system_server sensors_data_file:file r_file_perms;
+allow system_server wpa_socket:unix_dgram_socket sendto;
 allow system_app volume_data_file:file { read write open getattr };
 
-allow system sysfs:file { read open write };
-allow system self:capability { sys_module };
\ No newline at end of file
+allow system_server sysfs:file { read open write };
+allow system_server self:capability { sys_module };
\ No newline at end of file
diff --git a/selinux/wpa_supplicant.te b/selinux/wpa_supplicant.te
index ab5fb24..da2bed9 100755
--- a/selinux/wpa_supplicant.te
+++ b/selinux/wpa_supplicant.te
@@ -4,7 +4,7 @@ allow wpa init:unix_dgram_socket { read write };
 allow wpa devpts:chr_file { read write };
 
 allow wpa wpa_socket:unix_dgram_socket { read write };
-allow wpa_socket system:unix_dgram_socket sendto;
+allow wpa_socket system_app:unix_dgram_socket sendto;
 
 allow wpa_socket wifi_data_file:sock_file unlink;
 allow wpa rfkill_device:chr_file rw_file_perms;
\ No newline at end of file