Merge changes from topic "hiddenapi-dark-grey" am: 3d93d8f323

am: 5c776dea7e

Change-Id: Ia99cb83b2083a0c3f688830f4755df285bd0091b

config/hiddenapi-dark-greylist.txt

@@ -1,3 +1,7 @@
+#
+# DO NOT EDIT!
+# This is an autogenerated file containing the dark greylist as present in P.
+#
 Landroid/accessibilityservice/AccessibilityButtonController;-><init>(Landroid/accessibilityservice/IAccessibilityServiceConnection;)V
 Landroid/accessibilityservice/AccessibilityButtonController;->dispatchAccessibilityButtonAvailabilityChanged(Z)V
 Landroid/accessibilityservice/AccessibilityButtonController;->dispatchAccessibilityButtonClicked()V

tools/hiddenapi/generate_hiddenapi_lists.py

@@ -62,6 +62,8 @@ def get_args():
 def read_lines(filename):
     """Reads entire file and return it as a list of lines.
 
+    Lines which begin with a hash are ignored.
+
     Args:
         filename (string): Path to the file to read from.
 
@@ -69,7 +71,7 @@ def read_lines(filename):
         list: Lines of the loaded file as a list of strings.
     """
     with open(filename, 'r') as f:
-        return f.readlines()
+        return filter(lambda line: not line.startswith('#'), f.readlines())
 
 def write_lines(filename, lines):
     """Writes list of lines into a file, overwriting the file it it exists.

tools/hiddenapi/sort_api.sh

@@ -11,8 +11,14 @@ fi
 readarray A < "$source_list"
 # Sort
 IFS=$'\n'
+# Stash away comments
+C=( $(grep -E '^#' <<< "${A[*]}") )
+A=( $(grep -v -E '^#' <<< "${A[*]}") )
+# Sort entries
 A=( $(LC_COLLATE=C sort -f <<< "${A[*]}") )
 A=( $(uniq <<< "${A[*]}") )
+# Concatenate comments and entries
+A=( ${C[*]} ${A[*]} )
 unset IFS
 # Dump array back into the file
 printf '%s\n' "${A[@]}" > "$dest_list"