Merge "Annotate some APIs with threading annotations" (7b4b844f) · Commits · e / os / android_frameworks_base

core/java/android/app/Activity.java

+2 −0

Original line number	Diff line number	Diff line
		@@ -21,6 +21,7 @@ import android.annotation.DrawableRes;
		import android.annotation.IdRes;
		import android.annotation.IntDef;
		import android.annotation.LayoutRes;
		import android.annotation.MainThread;
		import android.annotation.NonNull;
		import android.annotation.Nullable;
		import android.annotation.StyleRes;
		@@ -927,6 +928,7 @@ public class Activity extends ContextThemeWrapper
		* @see #onRestoreInstanceState
		* @see #onPostCreate
		*/
		@MainThread
		@CallSuper
		protected void onCreate(@Nullable Bundle savedInstanceState) {
		if (DEBUG_LIFECYCLE) Slog.v(TAG, "onCreate " + this + ": " + savedInstanceState);

core/java/android/app/IntentService.java

+2 −0

Original line number	Diff line number	Diff line
		@@ -16,6 +16,7 @@

		package android.app;

		import android.annotation.WorkerThread;
		import android.content.Intent;
		import android.os.Handler;
		import android.os.HandlerThread;
		@@ -158,5 +159,6 @@ public abstract class IntentService extends Service {
		* @param intent The value passed to {@link
		* android.content.Context#startService(Intent)}.
		*/
		@WorkerThread
		protected abstract void onHandleIntent(Intent intent);
		}

core/java/android/bluetooth/BluetoothHealthCallback.java

+3 −0

Original line number	Diff line number	Diff line
		@@ -17,6 +17,7 @@

		package android.bluetooth;

		import android.annotation.BinderThread;
		import android.os.ParcelFileDescriptor;
		import android.util.Log;

		@@ -39,6 +40,7 @@ public abstract class BluetoothHealthCallback {
		* {@link BluetoothHealth#APP_CONFIG_UNREGISTRATION_SUCCESS} or
		* {@link BluetoothHealth#APP_CONFIG_UNREGISTRATION_FAILURE}
		*/
		@BinderThread
		public void onHealthAppConfigurationStatusChange(BluetoothHealthAppConfiguration config,
		int status) {
		Log.d(TAG, "onHealthAppConfigurationStatusChange: " + config + "Status: " + status);
		@@ -58,6 +60,7 @@ public abstract class BluetoothHealthCallback {
		* @param channelId The id associated with the channel. This id will be used
		* in future calls like when disconnecting the channel.
		*/
		@BinderThread
		public void onHealthChannelStateChange(BluetoothHealthAppConfiguration config,
		BluetoothDevice device, int prevState, int newState, ParcelFileDescriptor fd,
		int channelId) {

core/java/android/os/AsyncTask.java

+13 −0

Original line number	Diff line number	Diff line
		@@ -16,6 +16,9 @@

		package android.os;

		import android.annotation.MainThread;
		import android.annotation.WorkerThread;

		import java.util.ArrayDeque;
		import java.util.concurrent.BlockingQueue;
		import java.util.concurrent.Callable;
		@@ -350,6 +353,7 @@ public abstract class AsyncTask<Params, Progress, Result> {
		* @see #onPostExecute
		* @see #publishProgress
		*/
		@WorkerThread
		protected abstract Result doInBackground(Params... params);

		/**
		@@ -358,6 +362,7 @@ public abstract class AsyncTask<Params, Progress, Result> {
		* @see #onPostExecute
		* @see #doInBackground
		*/
		@MainThread
		protected void onPreExecute() {
		}

		@@ -374,6 +379,7 @@ public abstract class AsyncTask<Params, Progress, Result> {
		* @see #onCancelled(Object)
		*/
		@SuppressWarnings({"UnusedDeclaration"})
		@MainThread
		protected void onPostExecute(Result result) {
		}

		@@ -387,6 +393,7 @@ public abstract class AsyncTask<Params, Progress, Result> {
		* @see #doInBackground
		*/
		@SuppressWarnings({"UnusedDeclaration"})
		@MainThread
		protected void onProgressUpdate(Progress... values) {
		}

		@@ -405,6 +412,7 @@ public abstract class AsyncTask<Params, Progress, Result> {
		* @see #isCancelled()
		*/
		@SuppressWarnings({"UnusedParameters"})
		@MainThread
		protected void onCancelled(Result result) {
		onCancelled();
		}
		@@ -421,6 +429,7 @@ public abstract class AsyncTask<Params, Progress, Result> {
		* @see #cancel(boolean)
		* @see #isCancelled()
		*/
		@MainThread
		protected void onCancelled() {
		}

		@@ -535,6 +544,7 @@ public abstract class AsyncTask<Params, Progress, Result> {
		* @see #executeOnExecutor(java.util.concurrent.Executor, Object[])
		* @see #execute(Runnable)
		*/
		@MainThread
		public final AsyncTask<Params, Progress, Result> execute(Params... params) {
		return executeOnExecutor(sDefaultExecutor, params);
		}
		@@ -572,6 +582,7 @@ public abstract class AsyncTask<Params, Progress, Result> {
		*
		* @see #execute(Object[])
		*/
		@MainThread
		public final AsyncTask<Params, Progress, Result> executeOnExecutor(Executor exec,
		Params... params) {
		if (mStatus != Status.PENDING) {
		@@ -604,6 +615,7 @@ public abstract class AsyncTask<Params, Progress, Result> {
		* @see #execute(Object[])
		* @see #executeOnExecutor(java.util.concurrent.Executor, Object[])
		*/
		@MainThread
		public static void execute(Runnable runnable) {
		sDefaultExecutor.execute(runnable);
		}
		@@ -622,6 +634,7 @@ public abstract class AsyncTask<Params, Progress, Result> {
		* @see #onProgressUpdate
		* @see #doInBackground
		*/
		@WorkerThread
		protected final void publishProgress(Progress... values) {
		if (!isCancelled()) {
		getHandler().obtainMessage(MESSAGE_POST_PROGRESS,

core/java/android/view/View.java

+2 −0

Original line number	Diff line number	Diff line
		@@ -28,6 +28,7 @@ import android.annotation.LayoutRes;
		import android.annotation.NonNull;
		import android.annotation.Nullable;
		import android.annotation.Size;
		import android.annotation.UiThread;
		import android.content.ClipData;
		import android.content.Context;
		import android.content.Intent;
		@@ -699,6 +700,7 @@ import java.util.concurrent.atomic.AtomicInteger;
		*
		* @see android.view.ViewGroup
		*/
		@UiThread
		public class View implements Drawable.Callback, KeyEvent.Callback,
		AccessibilityEventSource {
		private static final boolean DBG = false;