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

Commit 4476888f authored Jul 25, 2017 by Matthew Gharrity Committed by Android (Google) Code Review Jul 25, 2017

Merge "Enable thread annotations for parameters"

parents 84b1d8e2 cb43616a

core/java/android/annotation/AnyThread.java

+2 −1

Original line number	Diff line number	Diff line
		@@ -17,6 +17,7 @@ package android.annotation;

		import static java.lang.annotation.ElementType.CONSTRUCTOR;
		import static java.lang.annotation.ElementType.METHOD;
		import static java.lang.annotation.ElementType.PARAMETER;
		import static java.lang.annotation.ElementType.TYPE;
		import static java.lang.annotation.RetentionPolicy.SOURCE;

		@@ -45,6 +46,6 @@ import java.lang.annotation.Target;
		* @hide
		*/
		@Retention(SOURCE)
		@Target({METHOD,CONSTRUCTOR,TYPE})
		@Target({METHOD,CONSTRUCTOR,TYPE,PARAMETER})
		public @interface AnyThread {
		}

core/java/android/annotation/BinderThread.java

+2 −1

Original line number	Diff line number	Diff line
		@@ -20,6 +20,7 @@ import java.lang.annotation.Target;

		import static java.lang.annotation.ElementType.CONSTRUCTOR;
		import static java.lang.annotation.ElementType.METHOD;
		import static java.lang.annotation.ElementType.PARAMETER;
		import static java.lang.annotation.ElementType.TYPE;
		import static java.lang.annotation.RetentionPolicy.SOURCE;

		@@ -37,6 +38,6 @@ import static java.lang.annotation.RetentionPolicy.SOURCE;
		* {@hide}
		*/
		@Retention(SOURCE)
		@Target({METHOD,CONSTRUCTOR,TYPE})
		@Target({METHOD,CONSTRUCTOR,TYPE,PARAMETER})
		public @interface BinderThread {
		}
		No newline at end of file

core/java/android/annotation/MainThread.java

+2 −1

Original line number	Diff line number	Diff line
		@@ -17,6 +17,7 @@ package android.annotation;

		import static java.lang.annotation.ElementType.CONSTRUCTOR;
		import static java.lang.annotation.ElementType.METHOD;
		import static java.lang.annotation.ElementType.PARAMETER;
		import static java.lang.annotation.ElementType.TYPE;
		import static java.lang.annotation.RetentionPolicy.SOURCE;

		@@ -44,6 +45,6 @@ import java.lang.annotation.Target;
		* @hide
		*/
		@Retention(SOURCE)
		@Target({METHOD,CONSTRUCTOR,TYPE})
		@Target({METHOD,CONSTRUCTOR,TYPE,PARAMETER})
		public @interface MainThread {
		}

core/java/android/annotation/UiThread.java

+2 −1

Original line number	Diff line number	Diff line
		@@ -17,6 +17,7 @@ package android.annotation;

		import static java.lang.annotation.ElementType.CONSTRUCTOR;
		import static java.lang.annotation.ElementType.METHOD;
		import static java.lang.annotation.ElementType.PARAMETER;
		import static java.lang.annotation.ElementType.TYPE;
		import static java.lang.annotation.RetentionPolicy.SOURCE;

		@@ -45,6 +46,6 @@ import java.lang.annotation.Target;
		* @hide
		*/
		@Retention(SOURCE)
		@Target({METHOD,CONSTRUCTOR,TYPE})
		@Target({METHOD,CONSTRUCTOR,TYPE,PARAMETER})
		public @interface UiThread {
		}

core/java/android/annotation/WorkerThread.java

+2 −1

Original line number	Diff line number	Diff line
		@@ -20,6 +20,7 @@ import java.lang.annotation.Target;

		import static java.lang.annotation.ElementType.CONSTRUCTOR;
		import static java.lang.annotation.ElementType.METHOD;
		import static java.lang.annotation.ElementType.PARAMETER;
		import static java.lang.annotation.ElementType.TYPE;
		import static java.lang.annotation.RetentionPolicy.SOURCE;

		@@ -42,6 +43,6 @@ import static java.lang.annotation.RetentionPolicy.SOURCE;
		* @hide
		*/
		@Retention(SOURCE)
		@Target({METHOD,CONSTRUCTOR,TYPE})
		@Target({METHOD,CONSTRUCTOR,TYPE,PARAMETER})
		public @interface WorkerThread {
		}