Merge "Treat seinfo=default name=<anything> as an error."
diff --git a/app.te b/app.te
index 06ede72..cd1d775 100644
--- a/app.te
+++ b/app.te
@@ -101,6 +101,9 @@
# Allow read/stat of /data/media files passed by Binder or local socket IPC.
allow appdomain media_rw_data_file:file { read getattr };
+# Read /data/data/com.android.providers.telephony files passed over Binder.
+allow appdomain radio_data_file:file { read getattr };
+
# Access SDcard.
allow appdomain sdcard_type:dir create_dir_perms;
allow appdomain sdcard_type:file create_file_perms;
diff --git a/drmserver.te b/drmserver.te
index c8e0b21..e2b62df 100644
--- a/drmserver.te
+++ b/drmserver.te
@@ -41,3 +41,6 @@
# Read resources from open apk files passed over Binder.
allow drmserver apk_data_file:file { read getattr };
allow drmserver asec_apk_file:file { read getattr };
+
+# Read /data/data/com.android.providers.telephony files passed over Binder.
+allow drmserver radio_data_file:file { read getattr };
diff --git a/file_contexts b/file_contexts
index cdacd37..dc91481 100644
--- a/file_contexts
+++ b/file_contexts
@@ -122,6 +122,7 @@
/system/bin/run-as -- u:object_r:runas_exec:s0
/system/bin/bootanimation u:object_r:bootanim_exec:s0
/system/bin/app_process u:object_r:zygote_exec:s0
+/system/bin/app_process64 u:object_r:zygote_exec:s0
/system/bin/servicemanager u:object_r:servicemanager_exec:s0
/system/bin/surfaceflinger u:object_r:surfaceflinger_exec:s0
/system/bin/drmserver u:object_r:drmserver_exec:s0
diff --git a/mediaserver.te b/mediaserver.te
index 43783d6..cdd9772 100644
--- a/mediaserver.te
+++ b/mediaserver.te
@@ -40,6 +40,9 @@
allow mediaserver apk_data_file:file { read getattr };
allow mediaserver asec_apk_file:file { read getattr };
+# Read /data/data/com.android.providers.telephony files passed over Binder.
+allow mediaserver radio_data_file:file { read getattr };
+
# Access camera device.
allow mediaserver camera_device:chr_file rw_file_perms;
allow mediaserver rpmsg_device:chr_file rw_file_perms;