Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a03b4dc5 authored by Todd Poynor's avatar Todd Poynor Committed by android-build-merger
Browse files

Merge changes I76212f65,I6a29c678 into oc-dev 

am: 5975d4e3

Change-Id: I0441dc1f8a9ff11429a253d0510790b20b42e3b4
parents c74c0929 5975d4e3

init/reboot.cpp

+3 −1
Original line number Diff line number Diff line
@@ -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 @@ void DoReboot(unsigned int cmd, const std::string& reason, const std::string& re 
    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

+1 −1
Original line number Diff line number Diff line
@@ -409,7 +409,7 @@ on post-fs-data 
    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