do not merge: cherrypicked 2811b3eaca1ac1cf27a7d63aa9f5c4ec7723ff59 from master branch
diff --git a/src/com/android/contacts/ContactsGroupSyncSelector.java b/src/com/android/contacts/ContactsGroupSyncSelector.java
index a94f8db..869870f 100644
--- a/src/com/android/contacts/ContactsGroupSyncSelector.java
+++ b/src/com/android/contacts/ContactsGroupSyncSelector.java
@@ -18,8 +18,8 @@
import android.accounts.AccountManager;
import android.accounts.AuthenticatorException;
-import android.accounts.Future2;
-import android.accounts.Future2Callback;
+import android.accounts.AccountManagerFuture;
+import android.accounts.AccountManagerCallback;
import android.accounts.OperationCanceledException;
import android.app.ListActivity;
import android.content.ContentResolver;
@@ -164,9 +164,9 @@
bundle.putCharSequence("optional_message", getText(R.string.contactsSyncPlug));
AccountManager.get(this).getAuthTokenByFeatures(
GoogleLoginServiceConstants.ACCOUNT_TYPE, Gmail.GMAIL_AUTH_SERVICE,
- new String[]{GoogleLoginServiceConstants.FEATURE_GOOGLE_OR_DASHER}, this,
- bundle, null /* loginOptions */, new Future2Callback() {
- public void run(Future2 future) {
+ new String[]{GoogleLoginServiceConstants.FEATURE_HOSTED_OR_GOOGLE}, this,
+ bundle, null /* loginOptions */, new AccountManagerCallback<Bundle>() {
+ public void run(AccountManagerFuture<Bundle> future) {
try {
// do this to check if this request succeeded or not
future.getResult();