diff options
| author | Eric Erfanian <erfanian@google.com> | 2017-03-27 12:31:48 -0700 |
|---|---|---|
| committer | Eric Erfanian <erfanian@google.com> | 2017-03-27 12:31:48 -0700 |
| commit | 9779f967ebb9512e5b19090b071572c9c4f0f2a6 (patch) | |
| tree | 55d3e81855905643abd7b3ce5576a58ee0e9d9e6 /java/com/android/dialer/common | |
| parent | 9050823ccf6f512e06ad65c8a741cb17cbc4a833 (diff) | |
Update AOSP Dialer source from internal google3 repository at
cl/151342913.
Test: make, treehugger
This CL updates the AOSP Dialer source with all the changes that have
gone into the private google3 repository. This includes all the
changes from cl/151128062 (3/24/2017) to cl/151342913 (3/27/2017).
This goal of these drops is to keep the AOSP source in sync with the
internal google3 repository. Currently these sync are done by hand
with very minor modifications to the internal source code.
See the Android.mk file for list of modifications.
Our current goal is to do frequent drops (daily if possible) and
eventually switched to an automated process.
Change-Id: I8d4855628b62e9067e71f32ed40317617a1e3b02
Diffstat (limited to 'java/com/android/dialer/common')
| -rw-r--r-- | java/com/android/dialer/common/concurrent/AsyncTaskExecutor.java (renamed from java/com/android/dialer/common/AsyncTaskExecutor.java) | 2 | ||||
| -rw-r--r-- | java/com/android/dialer/common/concurrent/AsyncTaskExecutors.java (renamed from java/com/android/dialer/common/AsyncTaskExecutors.java) | 3 | ||||
| -rw-r--r-- | java/com/android/dialer/common/concurrent/DialerAsyncTaskHelper.java | 2 | ||||
| -rw-r--r-- | java/com/android/dialer/common/concurrent/FallibleAsyncTask.java (renamed from java/com/android/dialer/common/FallibleAsyncTask.java) | 4 |
4 files changed, 5 insertions, 6 deletions
diff --git a/java/com/android/dialer/common/AsyncTaskExecutor.java b/java/com/android/dialer/common/concurrent/AsyncTaskExecutor.java index caadfe7ce..3bdcd035b 100644 --- a/java/com/android/dialer/common/AsyncTaskExecutor.java +++ b/java/com/android/dialer/common/concurrent/AsyncTaskExecutor.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.dialer.common; +package com.android.dialer.common.concurrent; import android.os.AsyncTask; import android.support.annotation.MainThread; diff --git a/java/com/android/dialer/common/AsyncTaskExecutors.java b/java/com/android/dialer/common/concurrent/AsyncTaskExecutors.java index 77bebdb36..fd358328e 100644 --- a/java/com/android/dialer/common/AsyncTaskExecutors.java +++ b/java/com/android/dialer/common/concurrent/AsyncTaskExecutors.java @@ -14,10 +14,11 @@ * limitations under the License. */ -package com.android.dialer.common; +package com.android.dialer.common.concurrent; import android.os.AsyncTask; import android.support.annotation.MainThread; +import com.android.dialer.common.Assert; import java.util.concurrent.Executor; /** diff --git a/java/com/android/dialer/common/concurrent/DialerAsyncTaskHelper.java b/java/com/android/dialer/common/concurrent/DialerAsyncTaskHelper.java index acfcda7f6..65b408094 100644 --- a/java/com/android/dialer/common/concurrent/DialerAsyncTaskHelper.java +++ b/java/com/android/dialer/common/concurrent/DialerAsyncTaskHelper.java @@ -23,8 +23,6 @@ import android.os.Bundle; import android.support.annotation.MainThread; import android.support.annotation.WorkerThread; import com.android.dialer.common.Assert; -import com.android.dialer.common.AsyncTaskExecutor; -import com.android.dialer.common.AsyncTaskExecutors; import com.android.dialer.common.LogUtil; /** diff --git a/java/com/android/dialer/common/FallibleAsyncTask.java b/java/com/android/dialer/common/concurrent/FallibleAsyncTask.java index f3abace1a..6d02fe67f 100644 --- a/java/com/android/dialer/common/FallibleAsyncTask.java +++ b/java/com/android/dialer/common/concurrent/FallibleAsyncTask.java @@ -14,12 +14,12 @@ * limitations under the License */ -package com.android.dialer.common; +package com.android.dialer.common.concurrent; import android.os.AsyncTask; import android.support.annotation.NonNull; import android.support.annotation.Nullable; -import com.android.dialer.common.FallibleAsyncTask.FallibleTaskResult; +import com.android.dialer.common.concurrent.FallibleAsyncTask.FallibleTaskResult; import com.google.auto.value.AutoValue; /** |