commit a03b4dc574e0113fdbebdb3d23a78380aaab93f4
author Todd Poynor <toddpoynor@google.com> Fri Apr 14 01:37:03 2017 +0000
committer android-build-merger <android-build-merger@google.com> Fri Apr 14 01:37:03 2017 +0000
tree 4a081edf469ffd6caf9a6f77d9a48bba61846933
parent c74c0929296884741e6707d49a58043a719a3887
parent 5975d4e33724047d73883ca84fda8b360f2fe000

Merge changes I76212f65,I6a29c678 into oc-dev
am: 5975d4e337

Change-Id: I0441dc1f8a9ff11429a253d0510790b20b42e3b4

init/reboot.cpp

diff --git a/init/reboot.cpp b/init/reboot.cpp
index 8de3c78..d9ebd91 100644
--- a/init/reboot.cpp
+++ b/init/reboot.cpp
@@ -46,6 +46,7 @@
 #include <cutils/android_reboot.h>
 #include <fs_mgr.h>
 #include <logwrap/logwrap.h>
+#include <private/android_filesystem_config.h>
 
 #include "property_service.h"
 #include "service.h"
@@ -305,7 +306,8 @@
     Timer t;
     LOG(INFO) << "Reboot start, reason: " << reason << ", rebootTarget: " << rebootTarget;
 
-    android::base::WriteStringToFile(StringPrintf("%s\n", reason.c_str()), LAST_REBOOT_REASON_FILE);
+    android::base::WriteStringToFile(StringPrintf("%s\n", reason.c_str()), LAST_REBOOT_REASON_FILE,
+                                     S_IRUSR | S_IWUSR, AID_SYSTEM, AID_SYSTEM);
 
     if (cmd == ANDROID_RB_THERMOFF) {  // do not wait if it is thermal
         DoThermalOff();

rootdir/init.rc

diff --git a/rootdir/init.rc b/rootdir/init.rc
index 36d7d6a..15bbd32 100644
--- a/rootdir/init.rc
+++ b/rootdir/init.rc
@@ -409,7 +409,7 @@
     mkdir /data/misc/boottrace 0771 system shell
     mkdir /data/misc/update_engine 0700 root root
     mkdir /data/misc/trace 0700 root root
-    mkdir /data/misc/reboot 0700 root root
+    mkdir /data/misc/reboot 0700 system system
     # profile file layout
     mkdir /data/misc/profiles 0771 system system
     mkdir /data/misc/profiles/cur 0771 system system