From 394d22988c975c06eb7f9e0601635c4fd6815bbd Mon Sep 17 00:00:00 2001 From: "Haoran.Wang" Date: Thu, 6 Jun 2019 12:51:06 +0800 Subject: MA-14948 Append lock status by Android Property Follow Bootloader requirement spec in https://source.android.com/devices/bootloader/unlock-trusty. Need to pass the flash lock status by androidboot.flash.locked. This patch fixed the GTS failure com.google.android.gts.persistentdata.PersistentDataHostTest#testTestGetFlashLockState. Change-Id: I9a3508f7546b02c998e7668df2a33f864a58db75 Signed-off-by: Haoran.Wang --- drivers/usb/gadget/f_fastboot.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/usb/gadget/f_fastboot.c b/drivers/usb/gadget/f_fastboot.c index 14f23d6ea8..6ec6ebae26 100644 --- a/drivers/usb/gadget/f_fastboot.c +++ b/drivers/usb/gadget/f_fastboot.c @@ -2351,11 +2351,11 @@ int do_boota(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) { char bootargs_sec[ANDR_BOOT_EXTRA_ARGS_SIZE]; if (lock_status == FASTBOOT_LOCK) { snprintf(bootargs_sec, sizeof(bootargs_sec), - "androidboot.verifiedbootstate=green androidboot.slot_suffix=%s %s", + "androidboot.verifiedbootstate=green androidboot.flash.locked=1 androidboot.slot_suffix=%s %s", avb_out_data->ab_suffix, avb_out_data->cmdline); } else { snprintf(bootargs_sec, sizeof(bootargs_sec), - "androidboot.verifiedbootstate=orange androidboot.slot_suffix=%s %s", + "androidboot.verifiedbootstate=orange androidboot.flash.locked=0 androidboot.slot_suffix=%s %s", avb_out_data->ab_suffix, avb_out_data->cmdline); } env_set("bootargs_sec", bootargs_sec); -- cgit v1.2.3