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

Commit 3ed64eb3 authored by Yifan Hong's avatar Yifan Hong Committed by android-build-merger
Browse files

Merge "logical -> dynamic partitions." am: 10654730 am: 4b358da7 

am: 972a7e97

Change-Id: I4dfcb8cd634528748898740e49767c55080bdcf4
parents fcf397ea 972a7e97

adb/daemon/services.cpp

+1 −1
Original line number Diff line number Diff line
@@ -104,7 +104,7 @@ void reboot_service(unique_fd fd, const std::string& arg) { 
    std::string reboot_string = android::base::StringPrintf("reboot,%s", reboot_arg.c_str());



    if (reboot_arg == "fastboot" &&

        android::base::GetBoolProperty("ro.boot.logical_partitions", false) &&

        android::base::GetBoolProperty("ro.boot.dynamic_partitions", false) &&

        access("/dev/socket/recovery", F_OK) == 0) {

        LOG(INFO) << "Recovery specific reboot fastboot";

        /*

init/reboot.cpp

+1 −1
Original line number Diff line number Diff line
@@ -468,7 +468,7 @@ bool HandlePowerctlMessage(const std::string& command) { 
            // adb reboot fastboot should boot into bootloader for devices not

            // supporting logical partitions.

            if (reboot_target == "fastboot" &&

                !android::base::GetBoolProperty("ro.boot.logical_partitions", false)) {

                !android::base::GetBoolProperty("ro.boot.dynamic_partitions", false)) {

                reboot_target = "bootloader";

            }

            // When rebooting to the bootloader notify the bootloader writing