Update language to comply with Android’s inclusive language guidance
See https://source.android.com/setup/contribute/respectful-code for reference #inclusivefixit Bug: 161896447 Test: N/A Change-Id: I9fd970726d739da658f6419a1ccd3e4952b17c78
This commit is contained in:
@@ -273,7 +273,7 @@ def ParseApexPayloadInfo(avbtool, payload_path):
|
|||||||
else:
|
else:
|
||||||
payload_info[key] = value
|
payload_info[key] = value
|
||||||
|
|
||||||
# Sanity check.
|
# Validation check.
|
||||||
for key in ('Algorithm', 'Salt', 'apex.key', 'Hash Algorithm'):
|
for key in ('Algorithm', 'Salt', 'apex.key', 'Hash Algorithm'):
|
||||||
if key not in payload_info:
|
if key not in payload_info:
|
||||||
raise ApexInfoError(
|
raise ApexInfoError(
|
||||||
|
@@ -521,7 +521,7 @@ class BlockImageDiff(object):
|
|||||||
stashed_blocks -= free_size
|
stashed_blocks -= free_size
|
||||||
|
|
||||||
if common.OPTIONS.cache_size is not None:
|
if common.OPTIONS.cache_size is not None:
|
||||||
# Sanity check: abort if we're going to need more stash space than
|
# Validation check: abort if we're going to need more stash space than
|
||||||
# the allowed size (cache_size * threshold). There are two purposes
|
# the allowed size (cache_size * threshold). There are two purposes
|
||||||
# of having a threshold here. a) Part of the cache may have been
|
# of having a threshold here. a) Part of the cache may have been
|
||||||
# occupied by some recovery logs. b) It will buy us some time to deal
|
# occupied by some recovery logs. b) It will buy us some time to deal
|
||||||
|
@@ -1177,7 +1177,7 @@ def BuildVBMeta(image_path, partitions, name, needed_partitions):
|
|||||||
if args and args.strip():
|
if args and args.strip():
|
||||||
split_args = shlex.split(args)
|
split_args = shlex.split(args)
|
||||||
for index, arg in enumerate(split_args[:-1]):
|
for index, arg in enumerate(split_args[:-1]):
|
||||||
# Sanity check that the image file exists. Some images might be defined
|
# Check that the image file exists. Some images might be defined
|
||||||
# as a path relative to source tree, which may not be available at the
|
# as a path relative to source tree, which may not be available at the
|
||||||
# same location when running this script (we have the input target_files
|
# same location when running this script (we have the input target_files
|
||||||
# zip only). For such cases, we additionally scan other locations (e.g.
|
# zip only). For such cases, we additionally scan other locations (e.g.
|
||||||
|
@@ -1940,7 +1940,7 @@ def GenerateAbOtaPackage(target_file, output_file, source_file=None):
|
|||||||
|
|
||||||
def GenerateNonAbOtaPackage(target_file, output_file, source_file=None):
|
def GenerateNonAbOtaPackage(target_file, output_file, source_file=None):
|
||||||
"""Generates a non-A/B OTA package."""
|
"""Generates a non-A/B OTA package."""
|
||||||
# Sanity check the loaded info dicts first.
|
# Check the loaded info dicts first.
|
||||||
if OPTIONS.info_dict.get("no_recovery") == "true":
|
if OPTIONS.info_dict.get("no_recovery") == "true":
|
||||||
raise common.ExternalError(
|
raise common.ExternalError(
|
||||||
"--- target build has specified no recovery ---")
|
"--- target build has specified no recovery ---")
|
||||||
|
@@ -1116,7 +1116,7 @@ def ReadApexKeysInfo(tf_zip):
|
|||||||
privkey.endswith(privkey_suffix) and
|
privkey.endswith(privkey_suffix) and
|
||||||
pubkey[:-pubkey_suffix_len] == privkey[:-privkey_suffix_len])
|
pubkey[:-pubkey_suffix_len] == privkey[:-privkey_suffix_len])
|
||||||
|
|
||||||
# Sanity check on the container key names, as we'll carry them without the
|
# Check the container key names, as we'll carry them without the
|
||||||
# extensions. This doesn't apply to payload keys though, which we will use
|
# extensions. This doesn't apply to payload keys though, which we will use
|
||||||
# full names only.
|
# full names only.
|
||||||
container_cert = matches.group("CONTAINER_CERT")
|
container_cert = matches.group("CONTAINER_CERT")
|
||||||
|
Reference in New Issue
Block a user