commit 86c188f70d5a1db93cfcef97bafe9a97cc4bc726
author The Android Automerger <android-build@google.com> Sat Aug 08 01:03:13 2015 -0700
committer The Android Automerger <android-build@google.com> Sat Aug 08 01:03:13 2015 -0700
tree be9113114b56f645bf91d39ad075d469459c8972
parent 4af63fd19366c8dbc5b97acfcd0ea1d632746eed
parent 2f162acac60a345c3bcb76e73ffb8e7dd0b45513

merge in mnc-release history after reset to mnc-dev

file_contexts

diff --git a/file_contexts b/file_contexts
index 8fc29eb..d964f9b 100644
--- a/file_contexts
+++ b/file_contexts
@@ -314,7 +314,5 @@
 # external storage
 /mnt/media_rw(/.*)?         u:object_r:mnt_media_rw_file:s0
 /mnt/user(/.*)?             u:object_r:mnt_user_file:s0
-/mnt/runtime_default(/.*)?  u:object_r:storage_file:s0
-/mnt/runtime_read(/.*)?     u:object_r:storage_file:s0
-/mnt/runtime_write(/.*)?    u:object_r:storage_file:s0
+/mnt/runtime(/.*)?          u:object_r:storage_file:s0
 /storage(/.*)?              u:object_r:storage_file:s0

gatekeeperd.te

diff --git a/gatekeeperd.te b/gatekeeperd.te
index 4d62ce4..ca540c6 100644
--- a/gatekeeperd.te
+++ b/gatekeeperd.te
@@ -17,6 +17,8 @@
 # For permissions checking
 allow gatekeeperd system_server:binder call;
 allow gatekeeperd permission_service:service_manager find;
+# For parent user ID lookup
+allow gatekeeperd user_service:service_manager find;
 
 # for SID file access
 allow gatekeeperd gatekeeper_data_file:dir rw_dir_perms;