Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge change 6787

Browse Source 
* changes:
  AbstractSyncableContentProvider must only call onAccountsChanged with GAIA accounts
This commit is contained in:
Android (Google) Code Review
2009-07-13 16:35:58 -07:00
parent 1dcdce6db7 45107e0c32
commit e375fc5cac
1 changed files with 14 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
core/java/android/content/AbstractSyncableContentProvider.java
View File

@@ -165,6 +165,20 @@ public abstract class AbstractSyncableContentProvider extends SyncableContentPro
// Some providers override onAccountsChanged(); give them a database to
// work with.
mDb = mOpenHelper.getWritableDatabase();
// Only call onAccountsChanged on GAIA accounts; otherwise, the contacts and
// calendar providers will choke as they try to sync unknown accounts with
// AbstractGDataSyncAdapter, which will put acore into a crash loop
ArrayList<Account> gaiaAccounts = new ArrayList<Account>();
for (Account acct: accounts) {
if (acct.mType.equals("com.google.GAIA")) {
gaiaAccounts.add(acct);
}
}
accounts = new Account[gaiaAccounts.size()];
int i = 0;
for (Account acct: gaiaAccounts) {
accounts[i++] = acct;
}
onAccountsChanged(accounts);
TempProviderSyncAdapter syncAdapter = getTempProviderSyncAdapter();
if (syncAdapter != null) {
@@ -175,7 +189,6 @@ public abstract class AbstractSyncableContentProvider extends SyncableContentPro
return true;
}
/**
* Get a non-persistent instance of this content provider.
* You must call {@link #close} on the returned