Merge "Remove nullablility annotations from module-lib" into rvc-dev-plus-aosp am: 4134b2c2c8 (d77d777d) · Commits · e / os / android_frameworks_base

StubLibraries.bp

+3 −2

Original line number	Original line	Diff line number	Diff line
	@@ -259,8 +259,6 @@ java_defaults {
	name: "android_defaults_stubs_current",		name: "android_defaults_stubs_current",
	libs: [ "stub-annotations" ],		libs: [ "stub-annotations" ],
	static_libs: [		static_libs: [
	"private-stub-annotations-jar",

	// License notices from art module		// License notices from art module
	"art-notices-for-framework-stubs-jar",		"art-notices-for-framework-stubs-jar",
	],		],
	@@ -278,18 +276,21 @@ java_defaults {
	java_library_static {		java_library_static {
	name: "android_stubs_current",		name: "android_stubs_current",
	srcs: [ ":api-stubs-docs" ],		srcs: [ ":api-stubs-docs" ],
			static_libs: [ "private-stub-annotations-jar" ],
	defaults: ["android_defaults_stubs_current"],		defaults: ["android_defaults_stubs_current"],
	}		}

	java_library_static {		java_library_static {
	name: "android_system_stubs_current",		name: "android_system_stubs_current",
	srcs: [ ":system-api-stubs-docs" ],		srcs: [ ":system-api-stubs-docs" ],
			static_libs: [ "private-stub-annotations-jar" ],
	defaults: ["android_defaults_stubs_current"],		defaults: ["android_defaults_stubs_current"],
	}		}

	java_library_static {		java_library_static {
	name: "android_test_stubs_current",		name: "android_test_stubs_current",
	srcs: [ ":test-api-stubs-docs" ],		srcs: [ ":test-api-stubs-docs" ],
			static_libs: [ "private-stub-annotations-jar" ],
	defaults: ["android_defaults_stubs_current"],		defaults: ["android_defaults_stubs_current"],
	}		}

+0 −10

Original line number	Original line	Diff line number	Diff line
	// Signature format: 2.0		// Signature format: 2.0
	package android.annotation {

	@java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.SOURCE) @java.lang.annotation.Target({java.lang.annotation.ElementType.METHOD, java.lang.annotation.ElementType.PARAMETER, java.lang.annotation.ElementType.FIELD}) public @interface NonNull {
	}

	@java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.SOURCE) @java.lang.annotation.Target({java.lang.annotation.ElementType.METHOD, java.lang.annotation.ElementType.PARAMETER, java.lang.annotation.ElementType.FIELD}) public @interface Nullable {
	}

	}

	package android.net {		package android.net {

	public final class TetheredClient implements android.os.Parcelable {		public final class TetheredClient implements android.os.Parcelable {

+0 −3

Original line number	Original line	Diff line number	Diff line
	@@ -20,8 +20,6 @@ import static java.lang.annotation.ElementType.METHOD;
	import static java.lang.annotation.ElementType.PARAMETER;		import static java.lang.annotation.ElementType.PARAMETER;
	import static java.lang.annotation.RetentionPolicy.SOURCE;		import static java.lang.annotation.RetentionPolicy.SOURCE;

	import android.annotation.SystemApi.Client;

	import java.lang.annotation.Retention;		import java.lang.annotation.Retention;
	import java.lang.annotation.Target;		import java.lang.annotation.Target;

	@@ -36,6 +34,5 @@ import java.lang.annotation.Target;
	*/		*/
	@Retention(SOURCE)		@Retention(SOURCE)
	@Target({METHOD, PARAMETER, FIELD})		@Target({METHOD, PARAMETER, FIELD})
	@SystemApi(client = Client.MODULE_LIBRARIES)
	public @interface NonNull {		public @interface NonNull {
	}		}

+0 −3

Original line number	Original line	Diff line number	Diff line
	@@ -20,8 +20,6 @@ import static java.lang.annotation.ElementType.METHOD;
	import static java.lang.annotation.ElementType.PARAMETER;		import static java.lang.annotation.ElementType.PARAMETER;
	import static java.lang.annotation.RetentionPolicy.SOURCE;		import static java.lang.annotation.RetentionPolicy.SOURCE;

	import android.annotation.SystemApi.Client;

	import java.lang.annotation.Retention;		import java.lang.annotation.Retention;
	import java.lang.annotation.Target;		import java.lang.annotation.Target;

	@@ -43,6 +41,5 @@ import java.lang.annotation.Target;
	*/		*/
	@Retention(SOURCE)		@Retention(SOURCE)
	@Target({METHOD, PARAMETER, FIELD})		@Target({METHOD, PARAMETER, FIELD})
	@SystemApi(client = Client.MODULE_LIBRARIES)
	public @interface Nullable {		public @interface Nullable {
	}		}