Merge "Allow shell to read /proc/meminfo." into nyc-dev
diff --git a/adbd.te b/adbd.te
index cd5df2a..b44cf0d 100644
--- a/adbd.te
+++ b/adbd.te
@@ -36,7 +36,8 @@
# adb push/pull sdcard.
allow adbd tmpfs:dir search;
-allow adbd rootfs:lnk_file r_file_perms;
+allow adbd rootfs:lnk_file r_file_perms; # /sdcard symlink
+allow adbd tmpfs:lnk_file r_file_perms; # /mnt/sdcard symlink
allow adbd sdcard_type:dir create_dir_perms;
allow adbd sdcard_type:file create_file_perms;
diff --git a/app.te b/app.te
index c9c5ca2..c4ebdf6 100644
--- a/app.te
+++ b/app.te
@@ -33,8 +33,9 @@
allow appdomain dalvikcache_data_file:dir { search getattr };
allow appdomain dalvikcache_data_file:file r_file_perms;
-# Read the /sdcard symlink
+# Read the /sdcard and /mnt/sdcard symlinks
allow appdomain rootfs:lnk_file r_file_perms;
+allow appdomain tmpfs:lnk_file r_file_perms;
# Search /storage/emulated tmpfs mount.
allow appdomain tmpfs:dir r_dir_perms;
diff --git a/priv_app.te b/priv_app.te
index b2b9e57..5801619 100644
--- a/priv_app.te
+++ b/priv_app.te
@@ -36,7 +36,6 @@
allow priv_app system_api_service:service_manager find;
allow priv_app persistent_data_block_service:service_manager find;
allow priv_app recovery_service:service_manager find;
-allow priv_app contexthub_service:service_manager find;
# Traverse into /mnt/media_rw for bypassing FUSE daemon
# TODO: narrow this to just MediaProvider
diff --git a/service.te b/service.te
index bd6ab38..3cd258b 100644
--- a/service.te
+++ b/service.te
@@ -35,7 +35,7 @@
type bluetooth_manager_service, app_api_service, system_server_service, service_manager_type;
type cameraproxy_service, system_server_service, service_manager_type;
type clipboard_service, app_api_service, system_server_service, service_manager_type;
-type contexthub_service, system_server_service, service_manager_type;
+type contexthub_service, app_api_service, system_server_service, service_manager_type;
type IProxyService_service, app_api_service, system_server_service, service_manager_type;
type commontime_management_service, system_server_service, service_manager_type;
type connectivity_service, app_api_service, system_server_service, service_manager_type;