aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCosme Domínguez Díaz <cosme.ddiaz@gmail.com>2018-03-22 22:19:41 +0100
committerCosme Domínguez Díaz <cosme.ddiaz@gmail.com>2018-03-22 22:32:41 +0100
commit8193eb33bcb2bc0cdd7ae70e255481eb12d6cb0a (patch)
treef038ac7c03c1a75dc31cdce33e68e8c269a7f2d8
parentb6c3225555cdb2c4feaa7aa2ae6288c1f1b4e36e (diff)
msm8996-common: Use our own camera socket path.
* The path should have the same length as the previous one: /data/misc/camera/cam_socket * Also make the directory for the socket.
-rw-r--r--camera/QCamera2/stack/mm-camera-interface/src/mm_camera_sock.c2
-rw-r--r--proprietary-files.txt2
-rw-r--r--rootdir/etc/init.qcom.rc1
3 files changed, 3 insertions, 2 deletions
diff --git a/camera/QCamera2/stack/mm-camera-interface/src/mm_camera_sock.c b/camera/QCamera2/stack/mm-camera-interface/src/mm_camera_sock.c
index 92f9b1b..9637799 100644
--- a/camera/QCamera2/stack/mm-camera-interface/src/mm_camera_sock.c
+++ b/camera/QCamera2/stack/mm-camera-interface/src/mm_camera_sock.c
@@ -74,7 +74,7 @@ int mm_camera_socket_create(int cam_id, mm_camera_sock_type_t sock_type)
memset(&sock_addr, 0, sizeof(sock_addr));
sock_addr.addr_un.sun_family = AF_UNIX;
snprintf(sock_addr.addr_un.sun_path,
- UNIX_PATH_MAX, "/data/vendor/camera/cam_socket%d", cam_id);
+ UNIX_PATH_MAX, "/data/vendor/camera/cam_sock%d", cam_id);
rc = connect(socket_fd, &sock_addr.addr, sizeof(sock_addr.addr_un));
if (0 != rc) {
close(socket_fd);
diff --git a/proprietary-files.txt b/proprietary-files.txt
index 2a6ba00..94d9713 100644
--- a/proprietary-files.txt
+++ b/proprietary-files.txt
@@ -69,7 +69,7 @@ vendor/lib/libbtnv.so
# Camera
lib/libtrueportrait.so
-vendor/bin/mm-qcamera-daemon|0ffe963b560222f52e65084cd9de455656a7bc11
+vendor/bin/mm-qcamera-daemon|c0ea4d468ee6693f92460bb76b93880204fb8eda
vendor/lib/libchromaflash.so
vendor/lib/libflash_pmic.so
vendor/lib/libjpegdhw.so
diff --git a/rootdir/etc/init.qcom.rc b/rootdir/etc/init.qcom.rc
index e1e1af8..9f66506 100644
--- a/rootdir/etc/init.qcom.rc
+++ b/rootdir/etc/init.qcom.rc
@@ -91,6 +91,7 @@ on post-fs-data
# Create folder for mm-qcamera-daemon
mkdir /data/misc/camera 0770 camera camera
+ mkdir /data/vendor/camera 0770 camera camera
mkdir /data/media 0770 media_rw media_rw
chown media_rw media_rw /data/media