diff options
| author | Costin Manolache <costin@google.com> | 2009-09-29 22:47:52 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2009-09-29 22:47:52 -0700 |
| commit | e161dd8dd29717ad51347a4625161dd23e02484e (patch) | |
| tree | 8147b17dabcd29f3891b76701503824ff176c38d | |
| parent | 74bdcd9dd078c60458ef6a5a46afd4dcce1626c3 (diff) | |
| parent | ebdd82ec2b7c5abb42e2a354470475488a826fd7 (diff) | |
| download | GoogleContactsProvider-e161dd8dd29717ad51347a4625161dd23e02484e.tar.gz | |
am ebdd82ec: Merge change Id43a8e08 into eclair
Merge commit 'ebdd82ec2b7c5abb42e2a354470475488a826fd7' into eclair-plus-aosp
* commit 'ebdd82ec2b7c5abb42e2a354470475488a826fd7':
Remove GAIA string
| -rw-r--r-- | res/xml/syncadapter.xml | 2 | ||||
| -rw-r--r-- | src/com/android/providers/contacts/ContactsSyncAdapter.java | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/res/xml/syncadapter.xml b/res/xml/syncadapter.xml index 49bd1cc..d46be9a 100644 --- a/res/xml/syncadapter.xml +++ b/res/xml/syncadapter.xml @@ -22,5 +22,5 @@ <sync-adapter xmlns:android="http://schemas.android.com/apk/res/android" android:contentAuthority="contacts" - android:accountType="com.google.GAIA" + android:accountType="com.google" /> diff --git a/src/com/android/providers/contacts/ContactsSyncAdapter.java b/src/com/android/providers/contacts/ContactsSyncAdapter.java index 7503af8..c15f2da 100644 --- a/src/com/android/providers/contacts/ContactsSyncAdapter.java +++ b/src/com/android/providers/contacts/ContactsSyncAdapter.java @@ -512,7 +512,7 @@ public class ContactsSyncAdapter extends AbstractGDataSyncAdapter { } syncResult.stats.numAuthExceptions++; AccountManager.get(getContext()).invalidateAuthToken( - "com.google.GAIA", authToken); + "com.google", authToken); return; case HttpException.SC_CONFLICT: |