diff options
| author | Costin Manolache <costin@google.com> | 2009-09-29 18:58:49 -0700 |
|---|---|---|
| committer | Costin Manolache <costin@google.com> | 2009-09-29 22:51:07 -0700 |
| commit | c76cdd0723b99f478c9ba5329d14a971cd8dfb3d (patch) | |
| tree | 398b26005804b6d6a4300c31127f4c4eeb98f823 /src | |
| parent | c10787a94ab8d0163480b6f33bd4367d142164d4 (diff) | |
| download | ContactsProvider-c76cdd0723b99f478c9ba5329d14a971cd8dfb3d.tar.gz | |
Remove GAIA string
Diffstat (limited to 'src')
3 files changed, 9 insertions, 9 deletions
diff --git a/src/com/android/providers/contacts/ContactsProvider.java b/src/com/android/providers/contacts/ContactsProvider.java index 8da4c6fe..6a3e6dd5 100644 --- a/src/com/android/providers/contacts/ContactsProvider.java +++ b/src/com/android/providers/contacts/ContactsProvider.java @@ -431,25 +431,25 @@ public class ContactsProvider extends AbstractSyncableContentProvider { // in some upgrade paths, these column might already exists } db.execSQL("UPDATE people" - + " SET _sync_account_type='com.google.GAIA'" + + " SET _sync_account_type='com.google'" + " WHERE _sync_account IS NOT NULL"); db.execSQL("UPDATE _deleted_people" - + " SET _sync_account_type='com.google.GAIA'" + + " SET _sync_account_type='com.google'" + " WHERE _sync_account IS NOT NULL"); db.execSQL("UPDATE groups" - + " SET _sync_account_type='com.google.GAIA'" + + " SET _sync_account_type='com.google'" + " WHERE _sync_account IS NOT NULL"); db.execSQL("UPDATE _deleted_groups" - + " SET _sync_account_type='com.google.GAIA'" + + " SET _sync_account_type='com.google'" + " WHERE _sync_account IS NOT NULL"); db.execSQL("UPDATE settings" - + " SET _sync_account_type='com.google.GAIA'" + + " SET _sync_account_type='com.google'" + " WHERE _sync_account IS NOT NULL"); db.execSQL("UPDATE photos" - + " SET _sync_account_type='com.google.GAIA'" + + " SET _sync_account_type='com.google'" + " WHERE _sync_account IS NOT NULL"); db.execSQL("UPDATE groupmembership" - + " SET group_sync_account_type='com.google.GAIA'" + + " SET group_sync_account_type='com.google'" + " WHERE group_sync_account IS NOT NULL"); db.execSQL("CREATE INDEX groupTempIndex ON groups (" diff --git a/src/com/android/providers/contacts/ContactsProvider2.java b/src/com/android/providers/contacts/ContactsProvider2.java index d0b6eafb..32cefdce 100644 --- a/src/com/android/providers/contacts/ContactsProvider2.java +++ b/src/com/android/providers/contacts/ContactsProvider2.java @@ -320,7 +320,7 @@ public class ContactsProvider2 extends SQLiteContentProvider implements OnAccoun DisplayNameSources.EMAIL); } - public static final String DEFAULT_ACCOUNT_TYPE = "com.google.GAIA"; + public static final String DEFAULT_ACCOUNT_TYPE = "com.google"; public static final String FEATURE_LEGACY_HOSTED_OR_GOOGLE = "legacy_hosted_or_google"; /** Sql where statement for filtering on groups. */ diff --git a/src/com/android/providers/contacts/LegacyContactImporter.java b/src/com/android/providers/contacts/LegacyContactImporter.java index 47bc233e..9c17e4ab 100644 --- a/src/com/android/providers/contacts/LegacyContactImporter.java +++ b/src/com/android/providers/contacts/LegacyContactImporter.java @@ -58,7 +58,7 @@ public class LegacyContactImporter { private static final int MAX_ATTEMPTS = 5; private static final int DELAY_BETWEEN_ATTEMPTS = 2000; - public static final String DEFAULT_ACCOUNT_TYPE = "com.google.GAIA"; + public static final String DEFAULT_ACCOUNT_TYPE = "com.google"; private static final String DATABASE_NAME = "contacts.db"; private static final int INSERT_BATCH_SIZE = 200; |