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

Commit d785329a authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "Add @Nullable and @NonNull to module API" am: 04ee8253 

Change-Id: I61943d8e33dc94d780401448a8acc716966a5763
parents b3a0f10a 04ee8253

api/module-lib-current.txt

+10 −0
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 {

  }



}

core/java/android/annotation/NonNull.java

+6 −3
Original line number Original line Diff line number Diff line
@@ -15,14 +15,16 @@ 
 */

 */

package android.annotation;

package android.annotation;





import java.lang.annotation.Retention;

import java.lang.annotation.Target;



import static java.lang.annotation.ElementType.FIELD;

import static java.lang.annotation.ElementType.FIELD;

import static java.lang.annotation.ElementType.METHOD;

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.Target;



/**

/**

 * Denotes that a parameter, field or method return value can never be null.

 * Denotes that a parameter, field or method return value can never be null.

 * <p>

 * <p>
@@ -34,5 +36,6 @@ import static java.lang.annotation.RetentionPolicy.SOURCE; 
 */

 */

@Retention(SOURCE)

@Retention(SOURCE)

@Target({METHOD, PARAMETER, FIELD})

@Target({METHOD, PARAMETER, FIELD})

@SystemApi(client = Client.MODULE_LIBRARIES)

public @interface NonNull {

public @interface NonNull {

}
 
}

core/java/android/annotation/Nullable.java

+6 −3
Original line number Original line Diff line number Diff line
@@ -15,14 +15,16 @@ 
 */

 */

package android.annotation;

package android.annotation;





import java.lang.annotation.Retention;

import java.lang.annotation.Target;



import static java.lang.annotation.ElementType.FIELD;

import static java.lang.annotation.ElementType.FIELD;

import static java.lang.annotation.ElementType.METHOD;

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.Target;



/**

/**

 * Denotes that a parameter, field or method return value can be null.

 * Denotes that a parameter, field or method return value can be null.

 * <p>

 * <p>
@@ -41,5 +43,6 @@ import static java.lang.annotation.RetentionPolicy.SOURCE; 
 */

 */

@Retention(SOURCE)

@Retention(SOURCE)

@Target({METHOD, PARAMETER, FIELD})

@Target({METHOD, PARAMETER, FIELD})

@SystemApi(client = Client.MODULE_LIBRARIES)

public @interface Nullable {

public @interface Nullable {

}
 
}