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

Commit 3f86c25d authored by Chun-Wei Wang's avatar Chun-Wei Wang Committed by Automerger Merge Worker
Browse files

Merge "Disallow fastboot to modify locked DSU" into main am: 66b68dde am: a564954b 

Original change: https://android-review.googlesource.com/c/platform/system/core/+/2744993



Change-Id: Ie8d0b38ee04980bea76d0c86777b86aafdf6f66b
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents a11fa57b a564954b

fastboot/device/commands.cpp

+11 −0
Original line number Diff line number Diff line
@@ -639,6 +639,12 @@ bool UpdateSuperHandler(FastbootDevice* device, const std::vector<std::string>& 
    return UpdateSuper(device, args[1], wipe);

}



static bool IsLockedDsu() {

    std::string active_dsu;

    android::gsi::GetActiveDsu(&active_dsu);

    return android::base::EndsWith(active_dsu, ".lock");

}



bool GsiHandler(FastbootDevice* device, const std::vector<std::string>& args) {

    if (args.size() != 2) {

        return device->WriteFail("Invalid arguments");
@@ -653,6 +659,11 @@ bool GsiHandler(FastbootDevice* device, const std::vector<std::string>& args) { 
        return device->WriteStatus(FastbootResult::FAIL, "No GSI is installed");

    }



    if ((args[1] == "wipe" || args[1] == "disable") && GetDeviceLockStatus() && IsLockedDsu()) {

        // Block commands that modify the states of locked DSU

        return device->WriteFail("Command not available on locked DSU/devices");

    }



    if (args[1] == "wipe") {

        if (!android::gsi::UninstallGsi()) {

            return device->WriteStatus(FastbootResult::FAIL, strerror(errno));