ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge changes I76212f65,I6a29c678 into oc-dev

Browse source 
am: 5975d4e337

Change-Id: I0441dc1f8a9ff11429a253d0510790b20b42e3b4
This commit is contained in:
Todd Poynor 2017-04-14 01:37:03 +00:00 • committed by android-build-merger
commit a03b4dc574
2 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
init/reboot.cpp
View file

@ -46,6 +46,7 @@
#include <cutils/android_reboot.h> #include <cutils/android_reboot.h>
#include <fs_mgr.h> #include <fs_mgr.h>
#include <logwrap/logwrap.h> #include <logwrap/logwrap.h>
#include <private/android_filesystem_config.h>
#include "property_service.h" #include "property_service.h"
#include "service.h" #include "service.h"
@ -305,7 +306,8 @@ void DoReboot(unsigned int cmd, const std::string& reason, const std::string& re
Timer t; Timer t;
LOG(INFO) << "Reboot start, reason: " << reason << ", rebootTarget: " << rebootTarget; 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 if (cmd == ANDROID_RB_THERMOFF) { // do not wait if it is thermal
DoThermalOff(); DoThermalOff();

2
rootdir/init.rc
View file

@ -409,7 +409,7 @@ on post-fs-data
mkdir /data/misc/boottrace 0771 system shell mkdir /data/misc/boottrace 0771 system shell
mkdir /data/misc/update_engine 0700 root root mkdir /data/misc/update_engine 0700 root root
mkdir /data/misc/trace 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 # profile file layout
mkdir /data/misc/profiles 0771 system system mkdir /data/misc/profiles 0771 system system
mkdir /data/misc/profiles/cur 0771 system system mkdir /data/misc/profiles/cur 0771 system system