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

Commit ef4ac8fe authored by Anton Hansson's avatar Anton Hansson Committed by Automerger Merge Worker
Browse files

Merge "Remove nullablility annotations from module-lib" into rvc-dev am: 78b956de 

Change-Id: I0798a724276bfdc3b27b81fa2f6fd04d74cc6847
parents 5235ee1d 78b956de

StubLibraries.bp

+3 −1
Original line number Diff line number Diff line
@@ -254,7 +254,6 @@ droidstubs { 
java_defaults {

    name: "android_defaults_stubs_current",

    libs: [ "stub-annotations" ],

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

    errorprone: {

        javacflags: [

            "-XepDisableAllChecks",
@@ -270,18 +269,21 @@ java_defaults { 
java_library_static {

    name: "android_stubs_current",

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

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

    defaults: ["android_defaults_stubs_current"],

}



java_library_static {

    name: "android_system_stubs_current",

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

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

    defaults: ["android_defaults_stubs_current"],

}



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.net {



  public final class TetheredClient implements android.os.Parcelable {

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 {

}