Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5c776dea authored by David Brazdil's avatar David Brazdil Committed by android-build-merger
Browse files

Merge changes from topic "hiddenapi-dark-grey"

am: 3d93d8f3

Change-Id: I7ee3cfd512553bcf5ff3297a7df0db6786d3436a
parents eb0b6de5 3d93d8f3
Loading
Loading
Loading
Loading
+4 −0
Original line number Diff line number Diff line
#
# 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
+3 −1
Original line number Diff line number Diff line
@@ -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.
+6 −0
Original line number Diff line number Diff line
@@ -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"