Merge "app: aboot: Change to enable power off charging by default on user variant builds"
diff --git a/app/aboot/aboot.c b/app/aboot/aboot.c
index 0682e9c..3b8aead 100644
--- a/app/aboot/aboot.c
+++ b/app/aboot/aboot.c
@@ -1588,8 +1588,11 @@
 				info->is_unlocked = 1;
 			info->is_verified = 0;
 			info->is_tampered = 0;
+#if USER_BUILD_VARIANT
+			info->charger_screen_enabled = 1;
+#else
 			info->charger_screen_enabled = 0;
-
+#endif
 			write_device_info(info);
 		}
 		memcpy(dev, info, sizeof(device_info));