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

Commit 4e6c7135 authored by Anton Hansson's avatar Anton Hansson Committed by Android (Google) Code Review
Browse files

Merge "Remove nullablility annotations from module-lib"

parents 0013bb70 bf63f941

StubLibraries.bp

+5 −2
Original line number Diff line number Diff line
@@ -310,8 +310,6 @@ java_defaults { 
    name: "android_defaults_stubs_current",

    libs: [ "stub-annotations" ],

    static_libs: [

        "private-stub-annotations-jar",



        // License notices from art module

        "art-notices-for-framework-stubs-jar",

    ],
@@ -329,6 +327,7 @@ java_defaults { 
java_library_static {

    name: "android_monolith_stubs_current",

    srcs: [ ":api-stubs-docs" ],

    static_libs: [ "private-stub-annotations-jar" ],

    defaults: ["android_defaults_stubs_current"],

}
@@ -345,6 +344,7 @@ java_library_static { 
        "framework-statsd-stubs-publicapi",

        "framework-tethering-stubs-publicapi",

        "framework-wifi-stubs-publicapi",

        "private-stub-annotations-jar",

    ],

    defaults: ["android_defaults_stubs_current"],

}
@@ -358,6 +358,7 @@ java_library_static { 
java_library_static {

    name: "android_system_monolith_stubs_current",

    srcs: [ ":system-api-stubs-docs" ],

    static_libs: [ "private-stub-annotations-jar" ],

    defaults: ["android_defaults_stubs_current"],

}
@@ -375,6 +376,7 @@ java_library_static { 
        "framework-statsd-stubs-systemapi",

        "framework-tethering-stubs-systemapi",

        "framework-wifi-stubs-systemapi",

        "private-stub-annotations-jar",

    ],

    defaults: ["android_defaults_stubs_current"],

}
@@ -388,6 +390,7 @@ java_library_static { 
java_library_static {

    name: "android_test_stubs_current",

    srcs: [ ":test-api-stubs-docs" ],

    static_libs: [ "private-stub-annotations-jar" ],

    defaults: ["android_defaults_stubs_current"],

}

api/module-lib-current.txt

+0 −10
Original line number Diff line number Diff line 
// 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.content.rollback {



  public class RollbackManagerFrameworkInitializer {

core/java/android/annotation/NonNull.java

+0 −3
Original line number 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.RetentionPolicy.SOURCE;



import android.annotation.SystemApi.Client;



import java.lang.annotation.Retention;

import java.lang.annotation.Target;
@@ -36,6 +34,5 @@ import java.lang.annotation.Target; 
 */

@Retention(SOURCE)

@Target({METHOD, PARAMETER, FIELD})

@SystemApi(client = Client.MODULE_LIBRARIES)

public @interface NonNull {

}

core/java/android/annotation/Nullable.java

+0 −3
Original line number 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.RetentionPolicy.SOURCE;



import android.annotation.SystemApi.Client;



import java.lang.annotation.Retention;

import java.lang.annotation.Target;
@@ -43,6 +41,5 @@ import java.lang.annotation.Target; 
 */

@Retention(SOURCE)

@Target({METHOD, PARAMETER, FIELD})

@SystemApi(client = Client.MODULE_LIBRARIES)

public @interface Nullable {

}

non-updatable-api/module-lib-current.txt

+0 −10
Original line number Diff line number Diff line 
// 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.content.rollback {



  public class RollbackManagerFrameworkInitializer {