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

Commit d9ba061e authored by David Anderson's avatar David Anderson
Browse files

fastbootd: Add is-userspace variable. 

Bug: 78793464
Test: fastboot getvar is-userspace
          returns true for fastbootd
      fastboot getvar is-userspace
          returns false or error for bootloader fastboot.

Change-Id: I80e1ef6dcf3922e4f555cb2e409e3e098c16fbbc
parent 0d4277d7

fastboot/constants.h

+1 −0
Original line number Diff line number Diff line
@@ -57,3 +57,4 @@ 
#define FB_VAR_SLOT_SUCCESSFUL "slot-successful"

#define FB_VAR_SLOT_UNBOOTABLE "slot-unbootable"

#define FB_VAR_IS_LOGICAL "is-logical"

#define FB_VAR_IS_USERSPACE "is-userspace"

fastboot/device/commands.cpp

+2 −1
Original line number Diff line number Diff line
@@ -59,7 +59,8 @@ bool GetVarHandler(FastbootDevice* device, const std::vector<std::string>& args) 
            {FB_VAR_SLOT_SUCCESSFUL, GetSlotSuccessful},

            {FB_VAR_SLOT_UNBOOTABLE, GetSlotUnbootable},

            {FB_VAR_PARTITION_SIZE, GetPartitionSize},

            {FB_VAR_IS_LOGICAL, GetPartitionIsLogical}};

            {FB_VAR_IS_LOGICAL, GetPartitionIsLogical},

            {FB_VAR_IS_USERSPACE, GetIsUserspace}};



    // args[0] is command name, args[1] is variable.

    auto found_variable = kVariableMap.find(args[1]);

fastboot/device/variables.cpp

+4 −0
Original line number Diff line number Diff line
@@ -165,3 +165,7 @@ bool GetPartitionIsLogical(FastbootDevice* device, const std::vector<std::string 
    }

    return device->WriteFail("Partition not found");

}



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

    return device->WriteOkay("yes");

}

fastboot/device/variables.h

+1 −0
Original line number Diff line number Diff line
@@ -36,3 +36,4 @@ bool GetUnlocked(FastbootDevice* device, const std::vector<std::string>& args); 
bool GetHasSlot(FastbootDevice* device, const std::vector<std::string>& args);

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

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

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