Merge branch 'fp2-release' into fp2-dev-v2
* fp2-release:
FP2-1215: Build fingerprint standards are not followed
diff --git a/app/aboot/aboot.c b/app/aboot/aboot.c
index 813877d..5c1cfc0 100755
--- a/app/aboot/aboot.c
+++ b/app/aboot/aboot.c
@@ -1310,7 +1310,7 @@
memcpy(info->magic, DEVICE_MAGIC, DEVICE_MAGIC_SIZE);
info->is_unlocked = 0;
info->is_tampered = 0;
- info->charger_screen_enabled = 0;
+ info->charger_screen_enabled = 1;
write_device_info_mmc(info);
}
diff --git a/target/FP2/init.c b/target/FP2/init.c
index f56bf2f..58cf707 100644
--- a/target/FP2/init.c
+++ b/target/FP2/init.c
@@ -705,8 +705,8 @@
/* This function will always return 0 to facilitate
* automated testing/reboot with usb connected.
* uncomment if this feature is needed */
- /* if ((pon_reason == USB_CHG) || (pon_reason == DC_CHG))
- return 1;*/
+ if ((pon_reason == USB_CHG) || (pon_reason == DC_CHG))
+ return 1;
return 0;
}