Skip QD1A.190821.011 in stage-aosp-master
Bug: 141248619
Change-Id: I9d3be804e07fc7386252025f68301b4cd587ef5f
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index b0783d4..e0814c1 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -21,7 +21,7 @@
<uses-sdk
android:minSdkVersion="21"
- android:targetSdkVersion="28"/>
+ android:targetSdkVersion="29"/>
<original-package android:name="com.android.contacts"/>
diff --git a/res/values-en-rCA/strings.xml b/res/values-en-rCA/strings.xml
index 9c65bc7..f8649a2 100644
--- a/res/values-en-rCA/strings.xml
+++ b/res/values-en-rCA/strings.xml
@@ -80,7 +80,7 @@
<string name="title_from_google" msgid="4664084747121207202">"From Google"</string>
<string name="title_from_other_accounts" msgid="8307885412426754288">"From <xliff:g id="ACCOUNT">%s</xliff:g>"</string>
<string name="menu_set_ring_tone" msgid="8728345772068064946">"Set ringtone"</string>
- <string name="menu_redirect_calls_to_vm" msgid="83331924006712755">"Divert to voicemail"</string>
+ <string name="menu_redirect_calls_to_vm" msgid="83331924006712755">"Route to voicemail"</string>
<string name="menu_unredirect_calls_to_vm" msgid="8725542534701811737">"Don\'t route to voicemail"</string>
<string name="readOnlyContactWarning" msgid="7514475664695089411">"This contact is read-only. It can\'t be deleted, but you can hide it."</string>
<string name="readOnlyContactWarning_positive_button" msgid="8914797212167683673">"Hide contact"</string>
diff --git a/res/values-ja/donottranslate_config.xml b/res/values-ja/donottranslate_config.xml
index ff8a8eb..b357856 100644
--- a/res/values-ja/donottranslate_config.xml
+++ b/res/values-ja/donottranslate_config.xml
@@ -32,7 +32,4 @@
<!-- If true, the order of name fields in the editor is primary (i.e. given name first) -->
<bool name="config_editor_field_order_primary">false</bool>
-
- <!-- If true, phonetic name is included in the contact editor by default -->
- <bool name="config_editor_include_phonetic_name">true</bool>
</resources>
diff --git a/src/com/android/contacts/SimImportFragment.java b/src/com/android/contacts/SimImportFragment.java
index 6042939..cee1b1a 100644
--- a/src/com/android/contacts/SimImportFragment.java
+++ b/src/com/android/contacts/SimImportFragment.java
@@ -55,6 +55,7 @@
import com.google.common.base.Function;
import com.google.common.util.concurrent.Futures;
import com.google.common.util.concurrent.ListenableFuture;
+import com.google.common.util.concurrent.MoreExecutors;
import java.util.ArrayList;
import java.util.Arrays;
@@ -477,7 +478,7 @@
simLoadResult.accounts = accounts;
return simLoadResult;
}
- });
+ }, MoreExecutors.directExecutor());
}
private LoaderResult loadFromSim() {
diff --git a/src/com/android/contacts/model/AccountTypeManager.java b/src/com/android/contacts/model/AccountTypeManager.java
index f67f074..34f9cb2 100644
--- a/src/com/android/contacts/model/AccountTypeManager.java
+++ b/src/com/android/contacts/model/AccountTypeManager.java
@@ -59,6 +59,7 @@
import com.google.common.util.concurrent.Futures;
import com.google.common.util.concurrent.ListenableFuture;
import com.google.common.util.concurrent.ListeningExecutorService;
+import com.google.common.util.concurrent.MoreExecutors;
import java.util.ArrayList;
import java.util.Collections;
@@ -503,7 +504,8 @@
private synchronized void reloadAccountTypes() {
loadAccountTypes();
Futures.addCallback(
- Futures.transform(mAccountTypesFuture, mAccountsExtractor),
+ Futures.transform(mAccountTypesFuture, mAccountsExtractor,
+ MoreExecutors.directExecutor()),
newAccountsUpdatedCallback(mAccountManagerAccounts),
mMainThreadExecutor);
}
@@ -534,7 +536,8 @@
final ListenableFuture<List<List<AccountWithDataSet>>> all =
Futures.nonCancellationPropagating(
Futures.successfulAsList(
- Futures.transform(mAccountTypesFuture, mAccountsExtractor),
+ Futures.transform(mAccountTypesFuture, mAccountsExtractor,
+ MoreExecutors.directExecutor()),
mLocalAccountsFuture));
return Futures.transform(all, new Function<List<List<AccountWithDataSet>>,
@@ -560,7 +563,7 @@
AccountInfo.sortAccounts(null, result);
return result;
}
- });
+ }, MoreExecutors.directExecutor());
}
@Override
diff --git a/src/com/android/contacts/util/concurrent/FuturesUtil.java b/src/com/android/contacts/util/concurrent/FuturesUtil.java
index 113af93..ba72446 100644
--- a/src/com/android/contacts/util/concurrent/FuturesUtil.java
+++ b/src/com/android/contacts/util/concurrent/FuturesUtil.java
@@ -3,9 +3,10 @@
import android.os.Handler;
-import com.google.common.util.concurrent.FutureFallback;
+import com.google.common.util.concurrent.AsyncFunction;
import com.google.common.util.concurrent.Futures;
import com.google.common.util.concurrent.ListenableFuture;
+import com.google.common.util.concurrent.MoreExecutors;
import java.util.concurrent.CancellationException;
import java.util.concurrent.ScheduledExecutorService;
@@ -46,14 +47,14 @@
}
}, time, unit);
- return Futures.withFallback(future, new FutureFallback<V>() {
+ return Futures.catchingAsync(future, Throwable.class, new AsyncFunction<Throwable, V>() {
@Override
- public ListenableFuture<V> create(Throwable t) throws Exception {
+ public ListenableFuture<V> apply(Throwable t) throws Exception {
if ((t instanceof CancellationException) && didTimeout.get()) {
return Futures.immediateFailedFuture(new TimeoutException("Timeout expired"));
}
return Futures.immediateFailedFuture(t);
}
- });
+ }, MoreExecutors.directExecutor());
}
}
diff --git a/tests/AndroidManifest.xml b/tests/AndroidManifest.xml
index dfc40a9..f61efda 100644
--- a/tests/AndroidManifest.xml
+++ b/tests/AndroidManifest.xml
@@ -17,7 +17,7 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.android.contacts.tests">
- <uses-sdk android:minSdkVersion="21" android:targetSdkVersion="28" />
+ <uses-sdk android:minSdkVersion="21" android:targetSdkVersion="29" />
<uses-permission android:name="android.permission.READ_CONTACTS" />
<uses-permission android:name="android.permission.WRITE_CONTACTS" />
