summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Paul Duffin <paulduffin@google.com> 2021-02-09 16:48:48 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2021-02-09 16:48:48 +0000
commit80167cbe5c93c8581ed061a7e488d775d0702cc9 (patch)
tree8476aeec9379566ca2447f2ba576143090caec1e
parentc22ef814851a643d5f60c8c33ccf5a775c3eea90 (diff)
parent5705a1f7eea0059d70697ebb4107dc81ca69da6f (diff)
Fix lint errors in tools/hiddenapi am: f16a93c5b2 am: 5705a1f7ee
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1580532 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I25553707d34b70d05abc250bdb0a55c1c66da4b5
-rwxr-xr-xtools/hiddenapi/generate_hiddenapi_lists.py2
-rwxr-xr-xtools/hiddenapi/generate_hiddenapi_lists_test.py4
2 files changed, 3 insertions, 3 deletions
diff --git a/tools/hiddenapi/generate_hiddenapi_lists.py b/tools/hiddenapi/generate_hiddenapi_lists.py
index 28ff606d0381..681647548653 100755
--- a/tools/hiddenapi/generate_hiddenapi_lists.py
+++ b/tools/hiddenapi/generate_hiddenapi_lists.py
@@ -153,7 +153,7 @@ def write_lines(filename, lines):
"""Writes list of lines into a file, overwriting the file if it exists.
Args:
- filename (string): Path to the file to be writting into.
+ filename (string): Path to the file to be writing into.
lines (list): List of strings to write into the file.
"""
lines = map(lambda line: line + '\n', lines)
diff --git a/tools/hiddenapi/generate_hiddenapi_lists_test.py b/tools/hiddenapi/generate_hiddenapi_lists_test.py
index 93dbc23b2978..ff3d70881289 100755
--- a/tools/hiddenapi/generate_hiddenapi_lists_test.py
+++ b/tools/hiddenapi/generate_hiddenapi_lists_test.py
@@ -20,7 +20,7 @@ from generate_hiddenapi_lists import *
class TestHiddenapiListGeneration(unittest.TestCase):
def test_filter_apis(self):
- # Initialize flags so that A and B are put on the whitelist and
+ # Initialize flags so that A and B are put on the allow list and
# C, D, E are left unassigned. Try filtering for the unassigned ones.
flags = FlagsDict()
flags.parse_and_merge_csv(['A,' + FLAG_SDK, 'B,' + FLAG_SDK,
@@ -39,7 +39,7 @@ class TestHiddenapiListGeneration(unittest.TestCase):
# Check three things:
# (1) B is selected as valid unassigned
- # (2) A is not selected because it is assigned 'whitelist'
+ # (2) A is not selected because it is assigned to the allow list
# (3) D is not selected because it is not a valid key
self.assertEqual(
flags.get_valid_subset_of_unassigned_apis(set(['A', 'B', 'D'])), set([ 'B' ]))