Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "apilint: suppress certain nullability lints" am: ab911951ae am: a0ea746c9a

Browse Source 
am: e028b90b92

Change-Id: I3d30fb4321ff14dba4cea56be7a06a4f660c8898
This commit is contained in:
Adrian Roos
2019-10-10 07:13:44 -07:00
committed by android-build-merger
parent 8ec5f5b53b e028b90b92
commit 9d57018248
1 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
tools/apilint/apilint.py
View File

@@ -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")