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

Commit d29b9cdc authored Feb 25, 2025 by Paul Duffin

Remove from/to attributes from libcore.util.Nullable/NonNull

The attributes are not used, either in the code, or in Metalava and
their presence prevents mapping them to other, more common nullability
annotations like those in `android.annotation` or `androidx.annotation`
as Metalava needs to do when generating the stubs.

Matches the changes made in https://r.android.com/3508044.

Bug: 311619997
Test: m checkbuild
Change-Id: I4af4aa79f973dab41cf22c968fa83fe90d095610

parent 228ccb46

ravenwood/runtime-helper-src/libcore-fake/libcore/util/NonNull.java

+1 −11

Original line number	Diff line number	Diff line
		@@ -35,14 +35,4 @@ import java.lang.annotation.Target;
		@Retention(SOURCE)
		@Target({FIELD, METHOD, PARAMETER, TYPE_USE})
		@libcore.api.IntraCoreApi
		public @interface NonNull {
		/**
		* Min Android API level (inclusive) to which this annotation is applied.
		*/
		int from() default Integer.MIN_VALUE;

		/**
		* Max Android API level to which this annotation is applied.
		*/
		int to() default Integer.MAX_VALUE;
		}
		public @interface NonNull {}

ravenwood/runtime-helper-src/libcore-fake/libcore/util/Nullable.java

+1 −11

Original line number	Diff line number	Diff line
		@@ -35,14 +35,4 @@ import java.lang.annotation.Target;
		@Retention(SOURCE)
		@Target({FIELD, METHOD, PARAMETER, TYPE_USE})
		@libcore.api.IntraCoreApi
		public @interface Nullable {
		/**
		* Min Android API level (inclusive) to which this annotation is applied.
		*/
		int from() default Integer.MIN_VALUE;

		/**
		* Max Android API level to which this annotation is applied.
		*/
		int to() default Integer.MAX_VALUE;
		}
		public @interface Nullable {}