summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWolfgang Wiedmeyer <wolfgit@wiedmeyer.de>2015-12-21 16:19:01 +0100
committerWolfgang Wiedmeyer <wolfgit@wiedmeyer.de>2015-12-21 16:19:01 +0100
commit79ff22ae426ac43353050b0ccffd7b80a9aa2d01 (patch)
tree3792063f2f6b6a3868965e0c9c61a80276e3d4d8
parent48cbe74013f64ae5cd8d47ad56b8fc9e301cd6d3 (diff)
parent96cccc9f5d4c5908bbc9051242cf1fb43b8d0373 (diff)
downloaddevice_samsung_i9300-79ff22ae426ac43353050b0ccffd7b80a9aa2d01.zip
device_samsung_i9300-79ff22ae426ac43353050b0ccffd7b80a9aa2d01.tar.gz
device_samsung_i9300-79ff22ae426ac43353050b0ccffd7b80a9aa2d01.tar.bz2
Merge remote-tracking branch 'cyanogen/cm-13.0' into replicant-6.0
-rw-r--r--BoardConfig.mk3
-rw-r--r--libsensors/input.c10
-rw-r--r--libsensors/smdk4x12_sensors.h4
-rw-r--r--selinux/bluetooth.te1
-rw-r--r--selinux/vold.te3
5 files changed, 13 insertions, 8 deletions
diff --git a/BoardConfig.mk b/BoardConfig.mk
index 25ec327..a4dd438 100644
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -19,6 +19,9 @@
-include device/samsung/smdk4412-common/BoardCommonConfig.mk
+# Bionic
+MALLOC_IMPL := dlmalloc
+
# RIL
BOARD_MODEM_TYPE := xmm6262
diff --git a/libsensors/input.c b/libsensors/input.c
index eef2a8d..da3d6d7 100644
--- a/libsensors/input.c
+++ b/libsensors/input.c
@@ -214,10 +214,10 @@ int sysfs_path_prefix(char *name, char *path_prefix)
return -1;
}
-int sysfs_value_read(char *path)
+int64_t sysfs_value_read(char *path)
{
char buffer[100];
- int value;
+ int64_t value;
int fd = -1;
int rc;
@@ -232,7 +232,7 @@ int sysfs_value_read(char *path)
if (rc <= 0)
goto error;
- value = atoi(buffer);
+ value = (int64_t)strtoimax(buffer, NULL, 10);
goto complete;
error:
@@ -245,7 +245,7 @@ complete:
return value;
}
-int sysfs_value_write(char *path, int value)
+int sysfs_value_write(char *path, int64_t value)
{
char buffer[100];
int fd = -1;
@@ -258,7 +258,7 @@ int sysfs_value_write(char *path, int value)
if (fd < 0)
goto error;
- snprintf((char *) &buffer, sizeof(buffer), "%d\n", value);
+ snprintf((char *) &buffer, sizeof(buffer), "%" PRId64 "\n", value);
rc = write(fd, buffer, strlen(buffer));
if (rc < (int) strlen(buffer))
diff --git a/libsensors/smdk4x12_sensors.h b/libsensors/smdk4x12_sensors.h
index da3d173..7100334 100644
--- a/libsensors/smdk4x12_sensors.h
+++ b/libsensors/smdk4x12_sensors.h
@@ -83,8 +83,8 @@ int uinput_rel_create(const char *name);
void uinput_destroy(int uinput_fd);
int input_open(char *name);
int sysfs_path_prefix(char *name, char *path_prefix);
-int sysfs_value_read(char *path);
-int sysfs_value_write(char *path, int value);
+int64_t sysfs_value_read(char *path);
+int sysfs_value_write(char *path, int64_t value);
int sysfs_string_read(char *path, char *buffer, size_t length);
int sysfs_string_write(char *path, char *buffer, size_t length);
diff --git a/selinux/bluetooth.te b/selinux/bluetooth.te
index 9d11918..dbfbe0e 100644
--- a/selinux/bluetooth.te
+++ b/selinux/bluetooth.te
@@ -4,3 +4,4 @@ allow bluetooth firmware_exynos:dir { open read search };
allow bluetooth firmware_exynos:file { open read };
allow bluetooth sysfs:file write;
allow bluetooth efs_device_file:dir search;
+allow bluetooth wifi_data_file:file r_file_perms;
diff --git a/selinux/vold.te b/selinux/vold.te
index b39e3e3..ba429d6 100644
--- a/selinux/vold.te
+++ b/selinux/vold.te
@@ -2,7 +2,8 @@ allow vold kernel:process setsched;
allow vold sdcardd_exec:file { read open execute execute_no_trans };
allow vold log_device:dir search;
-allow vold storage_stub_file:dir { read open };
+allow vold storage_stub_file:dir { read open search write add_name };
+allow vold mnt_media_rw_stub_file:dir { read open };
allow vold blkid_exec:file { getattr execute read open execute_no_trans };
allow vold log_device:chr_file { write open };