z2_plus: Fix

3 files changed, 10 insertions, 6 deletions

diff --git a/BoardConfig.mk b/BoardConfig.mk
index eb476c6..6f41b0e 100755
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -110,16 +110,15 @@ QCOM_BT_USE_SMD_TTY := true
 # Camera
 BOARD_QTI_CAMERA_32BIT_ONLY := true
 USE_DEVICE_SPECIFIC_CAMERA := true
+TARGET_HAS_LEGACY_CAMERA_HAL1 := true
 
 # Charger
 BOARD_CHARGER_ENABLE_SUSPEND := true
 
 # CM Hardware
-#BOARD_HARDWARE_CLASS += $(PLATFORM_PATH)/cmhw
-TARGET_TAP_TO_WAKE_NODE := "/sys/devices/virtual/touch/tp_dev/gesture_on"
-#BOARD_USES_CYANOGEN_HARDWARE := true
-#BOARD_HARDWARE_CLASS += \
-#    hardware/cyanogen/cmhw
+BOARD_USES_CYANOGEN_HARDWARE := true
+BOARD_HARDWARE_CLASS += \
+    hardware/cyanogen/cmhw
 
 # CNE and DPM
 TARGET_LDPRELOAD := libNimsWrap.so
@@ -188,6 +187,9 @@ BOARD_SEPOLICY_DIRS += $(PLATFORM_PATH)/sepolicy
 # Sensors
 USE_SENSOR_MULTI_HAL := true
 
+# Tap to wake 
+TARGET_TAP_TO_WAKE_NODE := "/sys/devices/virtual/touch/tp_dev/gesture_on"
+
 # Timeservice
 BOARD_USES_QC_TIME_SERVICES := true
 
diff --git a/device.mk b/device.mk
index 030108e..1e2647e 100755
--- a/device.mk
+++ b/device.mk
@@ -131,7 +131,7 @@ PRODUCT_COPY_FILES += \
 
 # Camera
 PRODUCT_PACKAGES += \
-    Camera2
+    Snap
 
 # Connectivity Engine support (CNE)
 PRODUCT_PACKAGES += \
diff --git a/sepolicy/mediaserver.te b/sepolicy/mediaserver.te
index 859d58f..43c74fd 100644
--- a/sepolicy/mediaserver.te
+++ b/sepolicy/mediaserver.te
@@ -2,3 +2,5 @@ allow mediaserver audio_device:chr_file { ioctl open read write };
 allow mediaserver sensorservice_service:service_manager find;
 allow mediaserver system_server:unix_stream_socket { read write };
 allow mediaserver camera_data_file:dir search;
+allow mediaserver cameraproxy_service:service_manager find;
+allow mediaserver cameraserver_service:service_manager add;