diff options
| author | Android (Google) Code Review <android-gerrit@google.com> | 2009-09-30 01:41:20 -0400 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2009-09-30 01:41:20 -0400 |
| commit | ebdd82ec2b7c5abb42e2a354470475488a826fd7 (patch) | |
| tree | 8147b17dabcd29f3891b76701503824ff176c38d | |
| parent | a9c6ba2b43956f964c0751968f2704926ee5a7e7 (diff) | |
| parent | d43a8e08f3cc113ec857af0208596b7416d8fb7d (diff) | |
| download | GoogleContactsProvider-ebdd82ec2b7c5abb42e2a354470475488a826fd7.tar.gz | |
Merge change Id43a8e08 into eclair
* changes:
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: |