ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "fastbootd: Add is-userspace variable." am: 6d5b931466

Browse source 
am: 2f1e709145

Change-Id: I2ff3c8daa9a6e7a3948bc331baa9a9028e7b9f94
This commit is contained in:
David Anderson 2018-08-09 16:50:21 -07:00 • committed by android-build-merger
commit ed55753595
4 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
fastboot/constants.h
View file

@ -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"

3
fastboot/device/commands.cpp
View file

@ -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]);

4
fastboot/device/variables.cpp
View file

@ -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");
}

1
fastboot/device/variables.h
View file

@ -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);