am a181459: am a8ac71a: Merge "Label /data/diag_logs and allow qxdmlo…

…gger access on userdebug/eng." * commit 'a1814597525f994e34c7099f317aab24ed3102f9': Label /data/diag_logs and allow qxdmlogger access on userdebug/eng.
SnowDroid · May 8, 2014 · 06f5064 · 06f5064
2 parents cbef583 + a181459
commit 06f5064
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 1 deletion.
diff --git a/sepolicy/file.te b/sepolicy/file.te
@@ -6,6 +6,7 @@ type sensors_socket, file_type;
 type camera_socket, file_type;
 type thermald_socket, file_type;
 
+type diag_logs, file_type, data_file_type;
 type sensors_data_file, file_type, data_file_type;
 type time_data_file, file_type, data_file_type;
 type ramdump_data_file, file_type, data_file_type;

diff --git a/sepolicy/file_contexts b/sepolicy/file_contexts
@@ -89,7 +89,7 @@
 
 /data/cam_socket[0-9]              u:object_r:camera_socket:s0
 /data/app/sensor_ctl_socket        u:object_r:sensors_socket:s0
-
+/data/diag_logs(/.*)?              u:object_r:diag_logs:s0
 /data/nfc(/.*)?                    u:object_r:nfc_data_file:s0
 /data/misc/sensors(/.*)?           u:object_r:sensors_data_file:s0
 /data/system/sensors(/.*)?         u:object_r:sensors_data_file:s0

diff --git a/sepolicy/platform_app.te b/sepolicy/platform_app.te
@@ -1 +1,7 @@
 allow platform_app time:unix_stream_socket connectto;
+
+userdebug_or_eng(`
+  # qxdmlogger access to /data/diag_logs.
+  allow platform_app diag_logs:dir rw_dir_perms;
+  allow platform_app diag_logs:file create_file_perms;
+')