commit fafad1754be55f1b7eaffe1943de8ea8c5729987
author Linux Build Service Account <lnxbuild@localhost> Tue Jul 07 07:21:08 2015 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Tue Jul 07 07:21:08 2015 -0700
tree be395b3a1ee108ad5b9b71d509ae6df651c4e77d
parent 4068d970dee7334e82c7f0357a9c7b47843bc53d
parent 05f78bae301fa72e7a80cc41de1d93c6cf1dd038

Merge "app: aboot: Keep the non-secure device unlocked by default"

app/aboot/aboot.c

diff --git a/app/aboot/aboot.c b/app/aboot/aboot.c
index 3e3d663..d7c9786 100644
--- a/app/aboot/aboot.c
+++ b/app/aboot/aboot.c
@@ -1750,8 +1750,10 @@
 		if (memcmp(info->magic, DEVICE_MAGIC, DEVICE_MAGIC_SIZE))
 		{
 			memcpy(info->magic, DEVICE_MAGIC, DEVICE_MAGIC_SIZE);
-			info->is_unlocked = 0;
-			info->is_verified = 0;
+			if (is_secure_boot_enable())
+				info->is_unlocked = 0;
+			else
+				info->is_verified = 1;
 			info->is_tampered = 0;
 #if USER_BUILD_VARIANT
 			info->charger_screen_enabled = 1;