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

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

Merge changes I6a29c678,I76212f65 

am: e771b69e

Change-Id: Icfa83c8939b8fc9fc43f47051d0e42ce9111f48b
parents 04989a7a e771b69e

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
@@ -406,7 +406,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