p96705831
/
platform_build
forked from openkylin/platform_build
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Disable downgrade VABC OTAs 

Downgrade VABC OTA causes users to wait in recovery for merge to
complete, disable by default.

Test: th
Test: generate downgrade OTA, make sure VABC disabled
Test: generate upgrade OTA with --wipe_user_data, make sure VABC
disabled
Test: generate upgrade OTA, make sure VABC is used
Test: generate downgrade OTA with --vabc_downgrade, make sure VABC is
enabled
Bug: 187215486

Change-Id: Ib7e6165252d47f1ecaac4fc2329b580274c8d70e
This commit is contained in:
Kelvin Zhang 2021-05-04 18:20:34 -04:00
parent 664959831e
commit 2a3e5b1cf5
1 changed files with 19 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
tools/releasetools/ota_from_target_files.py
View File

@ -215,6 +215,12 @@ A/B OTA specific options
--disable_vabc --disable_vabc
Disable Virtual A/B Compression, for builds that have compression enabled Disable Virtual A/B Compression, for builds that have compression enabled
by default. by default.
--vabc_downgrade
Don't disable Virtual A/B Compression for downgrading OTAs.
For VABC downgrades, we must finish merging before doing data wipe, and
since data wipe is required for downgrading OTA, this might cause long
wait time in recovery.
""" """
from __future__ import print_function from __future__ import print_function
@ -278,6 +284,7 @@ OPTIONS.partial = None
OPTIONS.custom_images = {} OPTIONS.custom_images = {}
OPTIONS.disable_vabc = False OPTIONS.disable_vabc = False
OPTIONS.spl_downgrade = False OPTIONS.spl_downgrade = False
OPTIONS.vabc_downgrade = False
POSTINSTALL_CONFIG = 'META/postinstall_config.txt' POSTINSTALL_CONFIG = 'META/postinstall_config.txt'
DYNAMIC_PARTITION_INFO = 'META/dynamic_partitions_info.txt' DYNAMIC_PARTITION_INFO = 'META/dynamic_partitions_info.txt'
@ -1284,6 +1291,8 @@ def main(argv):
elif o == "--spl_downgrade": elif o == "--spl_downgrade":
OPTIONS.spl_downgrade = True OPTIONS.spl_downgrade = True
OPTIONS.wipe_user_data = True OPTIONS.wipe_user_data = True
elif o == "--vabc_downgrade":
OPTIONS.vabc_downgrade = True
else: else:
return False return False
return True return True
@ -1326,7 +1335,8 @@ def main(argv):
"partial=", "partial=",
"custom_image=", "custom_image=",
"disable_vabc", "disable_vabc",
"spl_downgrade" "spl_downgrade",
"vabc_downgrade",
], extra_option_handler=option_handler) ], extra_option_handler=option_handler)
if len(args) != 2: if len(args) != 2:
@ -1347,7 +1357,14 @@ def main(argv):
else: else:
OPTIONS.info_dict = ParseInfoDict(args[0]) OPTIONS.info_dict = ParseInfoDict(args[0])
if OPTIONS.downgrade: if OPTIONS.wipe_user_data:
if not OPTIONS.vabc_downgrade:
logger.info("Detected downgrade/datawipe OTA."
"When wiping userdata, VABC OTA makes the user "
"wait in recovery mode for merge to finish. Disable VABC by "
"default. If you really want to do VABC downgrade, pass "
"--vabc_downgrade")
OPTIONS.disable_vabc = True
# We should only allow downgrading incrementals (as opposed to full). # We should only allow downgrading incrementals (as opposed to full).
# Otherwise the device may go back from arbitrary build with this full # Otherwise the device may go back from arbitrary build with this full
# OTA package. # OTA package.