Merge "Background tasks can decide which executor to run with." (47cf7b66) · Commits · e / os / android_packages_apps_Contacts

res/layout/playback_layout.xml

+2 −3

Original line number	Diff line number	Diff line
		@@ -69,19 +69,18 @@
		android:progressDrawable="@drawable/seekbar_drawable"
		android:thumb="@drawable/seek_bar_thumb"
		android:thumbOffset="8dip"
		android:progress="20"
		android:progress="0"
		android:paddingLeft="8dip"
		android:paddingRight="8dip"
		android:paddingTop="30dip"
		android:paddingBottom="20dip"
		android:layout_marginRight="64dip"
		android:layout_marginLeft="64dip"
		android:max="50"
		android:max="0"
		android:layout_centerVertical="true"
		/>
		<TextView
		android:id="@+id/playback_position_text"
		android:text="@string/voicemail_initial_time"
		android:layout_height="wrap_content"
		android:layout_width="wrap_content"
		android:textSize="14sp"

res/values/strings.xml

+0 −3

Original line number	Diff line number	Diff line
		@@ -1619,9 +1619,6 @@
		<!-- Text used in the ticker to notify the user of the latest voicemail. [CHAR LIMIT=30] -->
		<string name="notification_new_voicemail_ticker">New voicemail from <xliff:g id="caller">%1$s</xliff:g></string>

		<!-- Initial display for position of current playback, do not translate. -->
		<string name="voicemail_initial_time">00:05</string>

		<!-- Message to show when there is an error playing back the voicemail. [CHAR LIMIT=40] -->
		<string name="voicemail_playback_error">failed to play voicemail</string>

src/com/android/contacts/CallDetailActivity.java

+2 −1

Original line number	Diff line number	Diff line
		@@ -37,6 +37,7 @@ import android.content.Intent;
		import android.content.res.Resources;
		import android.database.Cursor;
		import android.net.Uri;
		import android.os.AsyncTask;
		import android.os.Bundle;
		import android.provider.CallLog;
		import android.provider.CallLog.Calls;
		@@ -233,7 +234,7 @@ public class CallDetailActivity extends Activity {
		values.put(Voicemails.IS_READ, true);
		getContentResolver().update(voicemailUri, values, null, null);
		}
		});
		}, AsyncTask.THREAD_POOL_EXECUTOR);
		}

		/**

src/com/android/contacts/ContactsApplication.java

+3 −1

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

		package com.android.contacts;

		import static com.android.contacts.util.BackgroundTaskService.createAsyncTaskBackgroundTaskService;

		import com.android.contacts.model.AccountTypeManager;
		import com.android.contacts.test.InjectedServices;
		import com.android.contacts.util.BackgroundTaskService;
		@@ -97,7 +99,7 @@ public final class ContactsApplication extends Application {

		if (BackgroundTaskService.BACKGROUND_TASK_SERVICE.equals(name)) {
		if (mBackgroundTaskService == null) {
		mBackgroundTaskService = BackgroundTaskService.createBackgroundTaskService();
		mBackgroundTaskService = createAsyncTaskBackgroundTaskService();
		}
		return mBackgroundTaskService;
		}

src/com/android/contacts/util/BackgroundTaskService.java

+32 −3

Original line number	Diff line number	Diff line
		@@ -18,25 +18,54 @@ package com.android.contacts.util;

		import android.os.AsyncTask;

		import java.util.concurrent.Executor;

		/**
		* Service used to submit tasks to run in the background.
		* <p>
		* BackgroundTaskService makes the same memory-visibility guarantees that AsyncTask which it
		* emulates makes, namely that fields set in the {@link BackgroundTask#doInBackground()} method
		* will be visible to the {@link BackgroundTask#onPostExecute()} method.
		* <p>
		* You are not expected to derive from this class unless you are writing your own test
		* implementation, or you are absolutely sure that the instance in
		* {@link #createAsyncTaskBackgroundTaskService()} doesn't do what you need.
		*/
		public abstract class BackgroundTaskService {
		public static final String BACKGROUND_TASK_SERVICE = BackgroundTaskService.class.getName();

		/**
		* Executes the given BackgroundTask with the default Executor.
		* <p>
		* All {@link BackgroundTask#doInBackground()} tasks will be guaranteed to happen serially.
		* If this is not what you want, see {@link #submit(BackgroundTask, Executor)}.
		*/
		public abstract void submit(BackgroundTask task);

		public static BackgroundTaskService createBackgroundTaskService() {
		/**
		* Executes the BackgroundTask with the supplied Executor.
		* <p>
		* The main use-case for this method will be to allow submitted tasks to perform their
		* {@link BackgroundTask#doInBackground()} methods concurrently.
		*/
		public abstract void submit(BackgroundTask task, Executor executor);

		/**
		* Creates a concrete BackgroundTaskService whose default Executor is
		* {@link AsyncTask#SERIAL_EXECUTOR}.
		*/
		public static BackgroundTaskService createAsyncTaskBackgroundTaskService() {
		return new AsyncTaskBackgroundTaskService();
		}

		private static final class AsyncTaskBackgroundTaskService extends BackgroundTaskService {
		@Override
		public void submit(final BackgroundTask task) {
		public void submit(BackgroundTask task) {
		submit(task, AsyncTask.SERIAL_EXECUTOR);
		}

		@Override
		public void submit(final BackgroundTask task, Executor executor) {
		new AsyncTask<Void, Void, Void>() {
		@Override
		protected Void doInBackground(Void... params) {
		@@ -48,7 +77,7 @@ public abstract class BackgroundTaskService {
		protected void onPostExecute(Void result) {
		task.onPostExecute();
		}
		}.execute();
		}.executeOnExecutor(executor);
		}
		}
		}