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

Commit e028b90b authored by Adrian Roos's avatar Adrian Roos Committed by android-build-merger
Browse files

Merge "apilint: suppress certain nullability lints" am: ab911951 

am: a0ea746c

Change-Id: Ie3ec80897b6c35326bdd1b40aeb6647f4d81955d
parents cbdc9a1e a0ea746c

tools/apilint/apilint.py

+9 −3
Original line number Diff line number Diff line
@@ -1976,7 +1976,9 @@ def verify_nullability(clazz): 
    """Catches missing nullability annotations"""



    for f in clazz.fields:

        if f.value is not None and 'static' in f.split and 'final' in f.split:

        if "enum_constant" in f.split:

            continue  # Enum constants are never null

        if f.value is not None and 'final' in f.split:

            continue  # Nullability of constants can be inferred.

        if f.typ not in PRIMITIVES and not has_nullability(f.annotations):

            error(clazz, f, "M12", "Field must be marked either @NonNull or @Nullable")
@@ -1985,8 +1987,12 @@ def verify_nullability(clazz): 
        verify_nullability_args(clazz, c)



    for m in clazz.methods:

        if m.name == "writeToParcel" or m.name == "onReceive":

            continue  # Parcelable.writeToParcel() and BroadcastReceiver.onReceive() are not yet annotated

        if m.name == "writeToParcel" or m.name == "onReceive" or m.name == "onBind":

            continue  # Parcelable.writeToParcel(), BroadcastReceiver.onReceive(), and Service.onBind() are not yet annotated



        if (m.name == "equals" and m.args == ["java.lang.Object"] or

                m.name == "toString" and m.args == []):

            continue  # Nullability of equals and toString is implicit.



        if m.typ not in PRIMITIVES and not has_nullability(m.annotations):

            error(clazz, m, "M12", "Return value must be marked either @NonNull or @Nullable")