diff options
author | Eric Erfanian <erfanian@google.com> | 2017-05-03 10:27:13 -0700 |
---|---|---|
committer | Eric Erfanian <erfanian@google.com> | 2017-05-03 12:01:21 -0700 |
commit | 8369df095a73a77b3715f8ae7ba06089cebca4ce (patch) | |
tree | 1a45d60921e293c6088efeaf4d9c408456f3e0e2 /java/com/android/dialer/common | |
parent | afa29d4a8659eeffc8d92a6216b154f594eeb895 (diff) |
This change reflects the Dialer V10 RC00 branch.
RC00 is based on:
branch: dialer-android_release_branch/153304843.1
synced to: 153304843
following the instructions at go/dialer-aosp-release.
In this release:
* Removes final apache sources.
* Uses native lite compilation.
More drops will follow with subsequent release candidates
until we reach our final v10 release, in cadence with our
prebuilt drops.
Test: TreeHugger, on device
Change-Id: Ic9684057230f9b579c777820c746cd21bf45ec0f
Diffstat (limited to 'java/com/android/dialer/common')
3 files changed, 20 insertions, 9 deletions
diff --git a/java/com/android/dialer/common/concurrent/DefaultDialerExecutorFactory.java b/java/com/android/dialer/common/concurrent/DefaultDialerExecutorFactory.java index 80ed725bc..4b6d81afd 100644 --- a/java/com/android/dialer/common/concurrent/DefaultDialerExecutorFactory.java +++ b/java/com/android/dialer/common/concurrent/DefaultDialerExecutorFactory.java @@ -28,10 +28,14 @@ import com.android.dialer.common.concurrent.DialerExecutor.Worker; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; import java.util.concurrent.ThreadFactory; +import javax.inject.Inject; /** The production {@link DialerExecutorFactory}. */ public class DefaultDialerExecutorFactory implements DialerExecutorFactory { + @Inject + public DefaultDialerExecutorFactory() {} + @Override @NonNull public <InputT, OutputT> DialerExecutor.Builder<InputT, OutputT> createUiTaskBuilder( @@ -116,14 +120,15 @@ public class DefaultDialerExecutorFactory implements DialerExecutorFactory { @NonNull @Override public DialerExecutor<InputT> build() { - dialerUiTaskFragment = DialerUiTaskFragment.create( - fragmentManager, - id, - super.worker, - super.successListener, - super.failureListener, - serialExecutorService, - parallelExecutorService); + dialerUiTaskFragment = + DialerUiTaskFragment.create( + fragmentManager, + id, + super.worker, + super.successListener, + super.failureListener, + serialExecutorService, + parallelExecutorService); return new UiDialerExecutor<>(dialerUiTaskFragment); } } diff --git a/java/com/android/dialer/common/concurrent/DialerExecutor.java b/java/com/android/dialer/common/concurrent/DialerExecutor.java index b0d1eac66..0237e3a05 100644 --- a/java/com/android/dialer/common/concurrent/DialerExecutor.java +++ b/java/com/android/dialer/common/concurrent/DialerExecutor.java @@ -33,7 +33,7 @@ public interface DialerExecutor<InputT> { interface Worker<InputT, OutputT> { @WorkerThread @Nullable - OutputT doInBackground(@Nullable InputT input); + OutputT doInBackground(@Nullable InputT input) throws Throwable; } /** Functional interface for handling the result of background work. */ diff --git a/java/com/android/dialer/common/res/values-b+sr+Latn/strings.xml b/java/com/android/dialer/common/res/values-b+sr+Latn/strings.xml new file mode 100644 index 000000000..52b5f67e6 --- /dev/null +++ b/java/com/android/dialer/common/res/values-b+sr+Latn/strings.xml @@ -0,0 +1,6 @@ +<?xml version="1.0" encoding="UTF-8"?> +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="network_name_wifi" msgid="3026388992566895417">"Wi-Fi"</string> + <string name="network_name_mobile" msgid="7655711935020766459">"Mobilni uređaji"</string> +</resources> |