Merge "Allow drmserver to unlink old socket file."
diff --git a/device.te b/device.te
index 5d3ba9c..bbbec28 100644
--- a/device.te
+++ b/device.te
@@ -1,7 +1,5 @@
# Device types
type device, dev_type, fs_type;
-type akm_device, dev_type;
-type accelerometer_device, dev_type;
type alarm_device, dev_type, mlstrustedobject;
type adb_device, dev_type;
type ashmem_device, dev_type, mlstrustedobject;
@@ -27,7 +25,6 @@
type mtd_device, dev_type;
type mtp_device, dev_type, mlstrustedobject;
type nfc_device, dev_type;
-type powervr_device, dev_type, mlstrustedobject;
type ptmx_device, dev_type, mlstrustedobject;
type qemu_device, dev_type;
type kmsg_device, dev_type;
diff --git a/domain.te b/domain.te
index 75dbe7c..c8063f7 100644
--- a/domain.te
+++ b/domain.te
@@ -51,7 +51,6 @@
allow domain ashmem_device:chr_file rw_file_perms;
allow domain binder_device:chr_file rw_file_perms;
allow domain ptmx_device:chr_file rw_file_perms;
-allow domain powervr_device:chr_file rw_file_perms;
allow domain log_device:dir search;
allow domain log_device:chr_file rw_file_perms;
allow domain alarm_device:chr_file r_file_perms;
diff --git a/file_contexts b/file_contexts
index 42b783f..d2d9949 100644
--- a/file_contexts
+++ b/file_contexts
@@ -29,8 +29,8 @@
# Devices
#
/dev(/.*)? u:object_r:device:s0
-/dev/akm8973.* u:object_r:akm_device:s0
-/dev/accelerometer u:object_r:accelerometer_device:s0
+/dev/akm8973.* u:object_r:sensors_device:s0
+/dev/accelerometer u:object_r:sensors_device:s0
/dev/alarm u:object_r:alarm_device:s0
/dev/android_adb.* u:object_r:adb_device:s0
/dev/ashmem u:object_r:ashmem_device:s0
@@ -64,7 +64,7 @@
/dev/pn544 u:object_r:nfc_device:s0
/dev/ppp u:object_r:ppp_device:s0
/dev/ptmx u:object_r:ptmx_device:s0
-/dev/pvrsrvkm u:object_r:powervr_device:s0
+/dev/pvrsrvkm u:object_r:gpu_device:s0
/dev/qemu_.* u:object_r:qemu_device:s0
/dev/kmsg u:object_r:kmsg_device:s0
/dev/null u:object_r:null_device:s0
diff --git a/wpa_supplicant.te b/wpa_supplicant.te
index 6ff1e10..38c0fb0 100644
--- a/wpa_supplicant.te
+++ b/wpa_supplicant.te
@@ -1,6 +1,5 @@
# wpa - wpa supplicant or equivalent
type wpa, domain;
-permissive_or_unconfined(wpa)
type wpa_exec, exec_type, file_type;
init_daemon_domain(wpa)