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

Merge "Remove nullablility annotations from module-lib" into rvc-dev-plus-aosp am: 4134b2c2c8

Browse Source 
Change-Id: Ia227c2c87fe0baaeb51bb1c523d64a51c45dafe7
This commit is contained in:
Anton Hansson
2020-05-25 10:15:10 +00:00
committed by Automerger Merge Worker
parent 49e0291812 4134b2c2c8
commit d77d777d2e
4 changed files with 3 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
StubLibraries.bp
View File

@@ -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"],
} }

10
api/module-lib-current.txt
View File

@@ -1,14 +1,4 @@
// 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 {

3
core/java/android/annotation/NonNull.java
View File

@@ -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 {
} }

3
core/java/android/annotation/Nullable.java
View File

@@ -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 {
} }