am b8fc8c26: am 4fbca2b6: Merge "Change AsyncTask.execute() back to using a... (07937496) · Commits · e / os / android_frameworks_base

api/11.xml

+22 −1

Original line number	Original line	Diff line number	Diff line
	@@ -53808,6 +53808,17 @@
	visibility="public"		visibility="public"
	>		>
	</field>		</field>
			<field name="EXTRA_LOCAL_ONLY"
			type="java.lang.String"
			transient="false"
			volatile="false"
			value=""android.intent.extra.LOCAL_ONLY""
			static="true"
			final="true"
			deprecated="not deprecated"
			visibility="public"
			>
			</field>
	<field name="EXTRA_PHONE_NUMBER"		<field name="EXTRA_PHONE_NUMBER"
	type="java.lang.String"		type="java.lang.String"
	transient="false"		transient="false"
	@@ -137499,8 +137510,18 @@
	<parameter name="values" type="Progress...">		<parameter name="values" type="Progress...">
	</parameter>		</parameter>
	</method>		</method>
			<field name="SERIAL_EXECUTOR"
			type="java.util.concurrent.Executor"
			transient="false"
			volatile="false"
			static="true"
			final="true"
			deprecated="not deprecated"
			visibility="public"
			>
			</field>
	<field name="THREAD_POOL_EXECUTOR"		<field name="THREAD_POOL_EXECUTOR"
	type="java.util.concurrent.ThreadPoolExecutor"		type="java.util.concurrent.Executor"
	transient="false"		transient="false"
	volatile="false"		volatile="false"
	static="true"		static="true"

api/current.xml

+11 −1

Original line number	Original line	Diff line number	Diff line
	@@ -140252,8 +140252,18 @@
	<parameter name="values" type="Progress...">		<parameter name="values" type="Progress...">
	</parameter>		</parameter>
	</method>		</method>
			<field name="SERIAL_EXECUTOR"
			type="java.util.concurrent.Executor"
			transient="false"
			volatile="false"
			static="true"
			final="true"
			deprecated="not deprecated"
			visibility="public"
			>
			</field>
	<field name="THREAD_POOL_EXECUTOR"		<field name="THREAD_POOL_EXECUTOR"
	type="java.util.concurrent.ThreadPoolExecutor"		type="java.util.concurrent.Executor"
	transient="false"		transient="false"
	volatile="false"		volatile="false"
	static="true"		static="true"

core/java/android/os/AsyncTask.java

+44 −16

Original line number	Original line	Diff line number	Diff line
	@@ -166,13 +166,17 @@ public abstract class AsyncTask<Params, Progress, Result> {
	new LinkedBlockingQueue<Runnable>(10);		new LinkedBlockingQueue<Runnable>(10);

	/**		/**
	* A {@link ThreadPoolExecutor} that can be used to execute tasks in parallel.		* An {@link Executor} that can be used to execute tasks in parallel.
	*/		*/
	public static final ThreadPoolExecutor THREAD_POOL_EXECUTOR		public static final Executor THREAD_POOL_EXECUTOR
	= new ThreadPoolExecutor(CORE_POOL_SIZE, MAXIMUM_POOL_SIZE, KEEP_ALIVE,		= new ThreadPoolExecutor(CORE_POOL_SIZE, MAXIMUM_POOL_SIZE, KEEP_ALIVE,
	TimeUnit.SECONDS, sPoolWorkQueue, sThreadFactory);		TimeUnit.SECONDS, sPoolWorkQueue, sThreadFactory);

	private static final SerialExecutor sSerialExecutor = new SerialExecutor();		/**
			* An {@link Executor} that executes tasks one at a time in serial
			* order. This serialization is global to a particular process.
			*/
			public static final Executor SERIAL_EXECUTOR = new SerialExecutor();

	private static final int MESSAGE_POST_RESULT = 0x1;		private static final int MESSAGE_POST_RESULT = 0x1;
	private static final int MESSAGE_POST_PROGRESS = 0x2;		private static final int MESSAGE_POST_PROGRESS = 0x2;
	@@ -468,13 +472,21 @@ public abstract class AsyncTask<Params, Progress, Result> {

	/**		/**
	* Executes the task with the specified parameters. The task returns		* Executes the task with the specified parameters. The task returns
	* itself (this) so that the caller can keep a reference to it. The tasks		* itself (this) so that the caller can keep a reference to it.
	* started by all invocations of this method in a given process are run
	* sequentially. Call the executeOnExecutor(Executor,Params...)
	* with a custom {@link Executor} to have finer grained control over how the
	* tasks are run.
	*		*
	* This method must be invoked on the UI thread.		* <p>Note: this function schedules the task on a queue for a single background
			* thread or pool of threads depending on the platform version. When first
			* introduced, AsyncTasks were executed serially on a single background thread.
			* Starting with {@link android.os.Build.VERSION_CODES#DONUT}, this was changed
			* to a pool of threads allowing multiple tasks to operate in parallel. After
			* {@link android.os.Build.VERSION_CODES#HONEYCOMB}, it is planned to change this
			* back to a single thread to avoid common application errors caused
			* by parallel execution. If you truly want parallel execution, you can use
			* the {@link #executeOnExecutor} version of this method
			* with {@link #THREAD_POOL_EXECUTOR}; however, see commentary there for warnings on
			* its use.
			*
			* <p>This method must be invoked on the UI thread.
	*		*
	* @param params The parameters of the task.		* @param params The parameters of the task.
	*		*
	@@ -484,14 +496,30 @@ public abstract class AsyncTask<Params, Progress, Result> {
	* {@link AsyncTask.Status#RUNNING} or {@link AsyncTask.Status#FINISHED}.		* {@link AsyncTask.Status#RUNNING} or {@link AsyncTask.Status#FINISHED}.
	*/		*/
	public final AsyncTask<Params, Progress, Result> execute(Params... params) {		public final AsyncTask<Params, Progress, Result> execute(Params... params) {
	return executeOnExecutor(sSerialExecutor, params);		return executeOnExecutor(THREAD_POOL_EXECUTOR, params);
	}		}

	/**		/**
	* Executes the task with the specified parameters. The task returns		* Executes the task with the specified parameters. The task returns
	* itself (this) so that the caller can keep a reference to it.		* itself (this) so that the caller can keep a reference to it.
	*		*
	* This method must be invoked on the UI thread.		* <p>This method is typically used with {@link #THREAD_POOL_EXECUTOR} to
			* allow multiple tasks to run in parallel on a pool of threads managed by
			* AsyncTask, however you can also use your own {@link Executor} for custom
			* behavior.
			*
			* <p><em>Warning:</em> Allowing multiple tasks to run in parallel from
			* a thread pool is generally <em>not</em> what one wants, because the order
			* of their operation is not defined. For example, if these tasks are used
			* to modify any state in common (such as writing a file due to a button click),
			* there are no guarantees on the order of the modifications.
			* Without careful work it is possible in rare cases for the newer version
			* of the data to be over-written by an older one, leading to obscure data
			* loss and stability issues. Such changes are best
			* executed in serial; to guarantee such work is serialized regardless of
			* platform version you can use this function with {@link #SERIAL_EXECUTOR}.
			*
			* <p>This method must be invoked on the UI thread.
	*		*
	* @param exec The executor to use. {@link #THREAD_POOL_EXECUTOR} is available as a		* @param exec The executor to use. {@link #THREAD_POOL_EXECUTOR} is available as a
	* convenient process-wide thread pool for tasks that are loosely coupled.		* convenient process-wide thread pool for tasks that are loosely coupled.
	@@ -527,11 +555,11 @@ public abstract class AsyncTask<Params, Progress, Result> {
	}		}

	/**		/**
	* Schedules the {@link Runnable} in serial with the other AsyncTasks that were started		* Convenience version of {@link #execute(Object...)} for use with
	* with {@link #execute}.		* a simple Runnable object.
	*/		*/
	public static void execute(Runnable runnable) {		public static void execute(Runnable runnable) {
	sSerialExecutor.execute(runnable);		THREAD_POOL_EXECUTOR.execute(runnable);
	}		}

	/**		/**