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

Commit bcb5bca1 authored by Tor Norbye's avatar Tor Norbye Committed by Android (Google) Code Review
Browse files

Merge "@IntDef and @StringDef must have source retention"

parents 3b3388ca 6413795b

core/java/android/annotation/IntDef.java

+2 −2
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ import java.lang.annotation.Retention; 
import java.lang.annotation.Target;



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

import static java.lang.annotation.RetentionPolicy.CLASS;

import static java.lang.annotation.RetentionPolicy.SOURCE;



/**

 * Denotes that the annotated element of integer type, represents
@@ -48,7 +48,7 @@ import static java.lang.annotation.RetentionPolicy.CLASS; 
 *

 * @hide

 */

@Retention(CLASS)

@Retention(SOURCE)

@Target({ANNOTATION_TYPE})

public @interface IntDef {

    /** Defines the constant prefix for this element */

core/java/android/annotation/StringDef.java

+2 −2
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ import java.lang.annotation.Retention; 
import java.lang.annotation.Target;



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

import static java.lang.annotation.RetentionPolicy.CLASS;

import static java.lang.annotation.RetentionPolicy.SOURCE;



/**

 * Denotes that the annotated String element, represents a logical
@@ -43,7 +43,7 @@ import static java.lang.annotation.RetentionPolicy.CLASS; 
 *

 * @hide

 */

@Retention(CLASS)

@Retention(SOURCE)

@Target({ANNOTATION_TYPE})

public @interface StringDef {

    /** Defines the allowed constants for this element */