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

am 458e40cb: am 2b1e6779: Merge change 25639 into eclair

Browse Source 
Merge commit '458e40cb10b5fc903c629d88c8b0d8966e6602cf'

* commit '458e40cb10b5fc903c629d88c8b0d8966e6602cf':
  do not use transactions for calls that just read the DB
This commit is contained in:
Fred Quintana
2009-09-17 17:35:31 -07:00
committed by Android Git Automerger
parent 2ce807dd68 458e40cb10
commit 7428359e99
1 changed files with 18 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

55
core/java/android/accounts/AccountManagerService.java
View File

@@ -287,25 +287,18 @@ public class AccountManagerService
private String readUserDataFromDatabase(Account account, String key) {
SQLiteDatabase db = mOpenHelper.getReadableDatabase();
db.beginTransaction();
Cursor cursor = db.query(TABLE_EXTRAS, new String[]{EXTRAS_VALUE},
EXTRAS_ACCOUNTS_ID
+ "=(select _id FROM accounts WHERE name=? AND type=?) AND "
+ EXTRAS_KEY + "=?",
new String[]{account.name, account.type, key}, null, null, null);
try {
long accountId = getAccountId(db, account);
if (accountId < 0) {
return null;
}
Cursor cursor = db.query(TABLE_EXTRAS, new String[]{EXTRAS_VALUE},
EXTRAS_ACCOUNTS_ID + "=" + accountId + " AND " + EXTRAS_KEY + "=?",
new String[]{key}, null, null, null);
try {
if (cursor.moveToNext()) {
return cursor.getString(0);
}
return null;
} finally {
cursor.close();
if (cursor.moveToNext()) {
return cursor.getString(0);
}
return null;
} finally {
db.endTransaction();
cursor.close();
}
}
@@ -530,15 +523,18 @@ public class AccountManagerService
public String readAuthTokenFromDatabase(Account account, String authTokenType) {
SQLiteDatabase db = mOpenHelper.getReadableDatabase();
db.beginTransaction();
Cursor cursor = db.query(TABLE_AUTHTOKENS, new String[]{AUTHTOKENS_AUTHTOKEN},
AUTHTOKENS_ACCOUNTS_ID + "=(select _id FROM accounts WHERE name=? AND type=?) AND "
+ AUTHTOKENS_TYPE + "=?",
new String[]{account.name, account.type, authTokenType},
null, null, null);
try {
long accountId = getAccountId(db, account);
if (accountId < 0) {
return null;
if (cursor.moveToNext()) {
return cursor.getString(0);
}
return getAuthToken(db, accountId, authTokenType);
return null;
} finally {
db.endTransaction();
cursor.close();
}
}
@@ -1069,21 +1065,6 @@ public class AccountManagerService
}
}
private String getAuthToken(SQLiteDatabase db, long accountId, String authTokenType) {
Cursor cursor = db.query(TABLE_AUTHTOKENS, new String[]{AUTHTOKENS_AUTHTOKEN},
AUTHTOKENS_ACCOUNTS_ID + "=" + accountId + " AND " + AUTHTOKENS_TYPE + "=?",
new String[]{authTokenType},
null, null, null);
try {
if (cursor.moveToNext()) {
return cursor.getString(0);
}
return null;
} finally {
cursor.close();
}
}
private abstract class Session extends IAccountAuthenticatorResponse.Stub
implements AuthenticatorBindHelper.Callback, IBinder.DeathRecipient {
IAccountManagerResponse mResponse;