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

Commit cb42d80c authored by Makoto Onuki's avatar Makoto Onuki Committed by Gerrit Code Review
Browse files

Merge "[ravenwood] Promote "ignore" to an annotation" into main

parents 9b828add 5f595085

ravenwood/scripts/pta-framework.sh

+2 −1
Original line number Diff line number Diff line
@@ -79,6 +79,7 @@ run_pta() { 
        $extra_args



    if ! [[ -f $OUT_SCRIPT ]] ; then

        echo "No files need updating."

        # no operations generated.

        exit 0

    fi

ravenwood/texts/ravenwood-framework-policies.txt

+1 −1
Original line number Diff line number Diff line
@@ -62,4 +62,4 @@ class android.text.ClipboardManager keep # no-pta 


# Just enough to allow ResourcesManager to run

class android.hardware.display.DisplayManagerGlobal keep # no-pta

    method getInstance ()Landroid/hardware/display/DisplayManagerGlobal; ignore
 
    method getInstance ()Landroid/hardware/display/DisplayManagerGlobal; ignore # no-pta

ravenwood/texts/ravenwood-standard-options.txt

+3 −0
Original line number Diff line number Diff line
@@ -31,6 +31,9 @@ 
--remove-annotation

    android.ravenwood.annotation.RavenwoodRemove



--ignore-annotation

    android.ravenwood.annotation.RavenwoodIgnore



--substitute-annotation

    android.ravenwood.annotation.RavenwoodReplace

ravenwood/tools/ravenhelper/src/com/android/platform/test/ravenwood/ravenhelper/policytoannot/Annotations.kt

+2 −1
Original line number Diff line number Diff line
@@ -45,7 +45,8 @@ class Annotations { 
                "@android.ravenwood.annotation.RavenwoodRedirect"

            FilterPolicy.Throw ->

                "@android.ravenwood.annotation.RavenwoodThrow"

            FilterPolicy.Ignore -> null // Ignore has no annotation. (because it's not very safe.)

            FilterPolicy.Ignore ->

                "@android.ravenwood.annotation.RavenwoodIgnore"

            FilterPolicy.Remove ->

                "@android.ravenwood.annotation.RavenwoodRemove"

        }