fix a bug where some accounts changed listeners don't see the new
version of the accounts because the accounts changed broadcast is
sent from within the transaction try block, thus before db.endTransaction()
is called.
bug: 2839034
Change-Id: I814c7de9998ba52b85256dd2f3f19104fba3049c
diff --git a/core/java/android/accounts/AccountManagerService.java b/core/java/android/accounts/AccountManagerService.java
index 2ead976..e6b1c08 100644
--- a/core/java/android/accounts/AccountManagerService.java
+++ b/core/java/android/accounts/AccountManagerService.java
@@ -399,19 +399,19 @@
private boolean insertAccountIntoDatabase(Account account, String password, Bundle extras) {
SQLiteDatabase db = mOpenHelper.getWritableDatabase();
+ if (account == null) {
+ return false;
+ }
+ final boolean noBroadcast = account.type.equals(GOOGLE_ACCOUNT_TYPE)
+ && extras != null && extras.getBoolean(NO_BROADCAST_FLAG, false);
+ // Remove the 'nobroadcast' flag since we don't want it to persist in the db. It is instead
+ // used as a control signal to indicate whether or not this insertion should result in
+ // an accounts changed broadcast being sent.
+ if (extras != null) {
+ extras.remove(NO_BROADCAST_FLAG);
+ }
db.beginTransaction();
try {
- if (account == null) {
- return false;
- }
- boolean noBroadcast = false;
- if (account.type.equals(GOOGLE_ACCOUNT_TYPE)) {
- // Look for the 'nobroadcast' flag and remove it since we don't want it to persist
- // in the db.
- noBroadcast = extras.getBoolean(NO_BROADCAST_FLAG, false);
- extras.remove(NO_BROADCAST_FLAG);
- }
-
long numMatches = DatabaseUtils.longForQuery(db,
"select count(*) from " + TABLE_ACCOUNTS
+ " WHERE " + ACCOUNTS_NAME + "=? AND " + ACCOUNTS_TYPE+ "=?",
@@ -436,13 +436,13 @@
}
}
db.setTransactionSuccessful();
- if (!noBroadcast) {
- sendAccountsChangedBroadcast();
- }
- return true;
} finally {
db.endTransaction();
}
+ if (!noBroadcast) {
+ sendAccountsChangedBroadcast();
+ }
+ return true;
}
private long insertExtra(SQLiteDatabase db, long accountId, String key, String value) {
@@ -1681,11 +1681,11 @@
try {
db.execSQL("DELETE from " + TABLE_AUTHTOKENS);
db.execSQL("UPDATE " + TABLE_ACCOUNTS + " SET " + ACCOUNTS_PASSWORD + " = ''");
- sendAccountsChangedBroadcast();
db.setTransactionSuccessful();
} finally {
db.endTransaction();
}
+ sendAccountsChangedBroadcast();
}
setMetaValue("imsi", imsi);
}