commit dd71012b3b58840e5a81198417b4d52510b137a9
author Tom Cherry <tomcherry@google.com> Thu Dec 03 23:02:53 2015 +0000
committer android-build-merger <android-build-merger@google.com> Thu Dec 03 23:02:53 2015 +0000
tree 1c93b36cf9b6d2ac37e5abab9ebf3eb69cc1b1d0
parent 2f49d6cc08bd9a3374053a2208f61a5b4ac10e2f
parent 27081aac3d59389121925800c711479cf780f80f

Merge changes from topic \'prop-security\' am: 65fc485574
am: e40884afa0

* commit 'e40884afa0d0e2aa24e957e78050a193589b07fd':
  Abort if __system_property_area_init fails
  restorecon /property_contexts

init/init.cpp

diff --git a/init/init.cpp b/init/init.cpp
index 86aed9a..958db36 100644
--- a/init/init.cpp
+++ b/init/init.cpp
@@ -602,6 +602,7 @@
     restorecon("/dev");
     restorecon("/dev/socket");
     restorecon("/dev/__properties__");
+    restorecon("/property_contexts");
     restorecon_recursive("/sys");
 
     epoll_fd = epoll_create1(EPOLL_CLOEXEC);

init/property_service.cpp

diff --git a/init/property_service.cpp b/init/property_service.cpp
index 96b4a37..66e46f8 100644
--- a/init/property_service.cpp
+++ b/init/property_service.cpp
@@ -79,7 +79,8 @@
     property_area_initialized = true;
 
     if (__system_property_area_init()) {
-        return;
+        ERROR("Failed to initialize property area\n");
+        exit(1);
     }
 
     pa_workspace.size = 0;