am 058e4d84: am 6c51bbc8: grouper: update prebuilt kernel - DO NOT MERGE
* commit '058e4d8405a2788dc3b2dcc052e033122d5ee5be':
grouper: update prebuilt kernel - DO NOT MERGE
diff --git a/BoardConfigCommon.mk b/BoardConfigCommon.mk
index 56a9f15..fdbb195 100644
--- a/BoardConfigCommon.mk
+++ b/BoardConfigCommon.mk
@@ -88,6 +88,7 @@
genfs_contexts \
bluetooth.te \
device.te \
+ domain.te \
drmserver.te \
init_shell.te \
file.te \
@@ -96,7 +97,6 @@
mediaserver.te \
rild.te \
sensors_config.te \
- shell.te \
surfaceflinger.te \
system_app.te \
system_server.te \
diff --git a/init.grouper.rc b/init.grouper.rc
index 01e36e4..a053524 100644
--- a/init.grouper.rc
+++ b/init.grouper.rc
@@ -27,35 +27,24 @@
on fs
setprop ro.crypto.umount_sd false
mount_all /fstab.grouper
- restorecon /dev/block/platform/sdhci-tegra.3/by-name/PER
on post-fs-data
- mkdir /data/misc/wifi 0770 wifi wifi
- mkdir /data/misc/wifi/sockets 0770 wifi wifi
- mkdir /data/misc/dhcp 0770 dhcp dhcp
- chown dhcp dhcp /data/misc/dhcp
-
mkdir /data/media 0770 media_rw media_rw
- restorecon_recursive /data/media
# change back to bluetooth from system
chown bluetooth net_bt_stack /data/misc/bluetooth
# sensors-config
mkdir /data/sensors 751
- restorecon_recursive /data/sensors
# /data/sensors was owned by system/system earlier.
# Force it to root/root if it already exists.
chown root root /data/sensors
mkdir /data/lightsensor 751
- restorecon_recursive /data/lightsensor
# /data/lightsensor was owned by system/system earlier.
# Force it to root/root if it already exists.
chown root root /data/lightsensor
mkdir /data/calibration
- restorecon_recursive /data/calibration
mkdir /data/amit
- restorecon_recursive /data/amit
# Set indication (checked by vold) that we have finished this action
setprop vold.post_fs_data_done 1
diff --git a/sepolicy/device.te b/sepolicy/device.te
index 0efc288..0ec95ae 100644
--- a/sepolicy/device.te
+++ b/sepolicy/device.te
@@ -1,5 +1,4 @@
type knv_device, dev_type;
type nvhost_device, dev_type;
type elan_ip_device, dev_type;
-type sensors_block_device, dev_type;
type diag_device, dev_type;
diff --git a/sepolicy/domain.te b/sepolicy/domain.te
new file mode 100644
index 0000000..07223d1
--- /dev/null
+++ b/sepolicy/domain.te
@@ -0,0 +1,3 @@
+userdebug_or_eng(`
+ allow domain diag_device:chr_file rw_file_perms;
+')
diff --git a/sepolicy/file_contexts b/sepolicy/file_contexts
index bff58ba..f3bd1eb 100644
--- a/sepolicy/file_contexts
+++ b/sepolicy/file_contexts
@@ -1,4 +1,3 @@
-/dev/block/platform/sdhci-tegra.3/by-name/PER u:object_r:sensors_block_device:s0
/dev/diag u:object_r:diag_device:s0
/dev/elan-iap u:object_r:elan_ip_device:s0
/dev/knvmap u:object_r:knv_device:s0
diff --git a/sepolicy/rild.te b/sepolicy/rild.te
index 7718e27..8654560 100644
--- a/sepolicy/rild.te
+++ b/sepolicy/rild.te
@@ -1,5 +1,3 @@
-allow rild diag_device:chr_file rw_file_perms;
-
# Kernel bug for Linux < 3.3: sysfs inodes can lose their security context
# and revert to the base sysfs type.
allow rild sysfs:file write;
diff --git a/sepolicy/system_server.te b/sepolicy/system_server.te
index c3eda54..1fba21e 100644
--- a/sepolicy/system_server.te
+++ b/sepolicy/system_server.te
@@ -1,4 +1,3 @@
allow system_server { knv_device }:chr_file rw_file_perms;
allow system_server sysfs_devices_system_cpu:file w_file_perms;
allow system_server elan_ip_device:chr_file rw_file_perms;
-allow system_server diag_device:chr_file rw_file_perms;