Merge "Correctly update database during account rename." (d5d94698) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/accounts/AccountManagerService.java

+7 −1

Original line number	Diff line number	Diff line
		@@ -1881,7 +1881,13 @@ public class AccountManagerService
		final long accountId = accounts.accountsDb.findDeAccountId(accountToRename);
		if (accountId >= 0) {
		accounts.accountsDb.renameCeAccount(accountId, newName);
		accounts.accountsDb.renameDeAccount(accountId, newName, accountToRename.name);
		if (accounts.accountsDb.renameDeAccount(
		accountId, newName, accountToRename.name)) {
		accounts.accountsDb.setTransactionSuccessful();
		} else {
		Log.e(TAG, "renameAccount failed");
		return null;
		}
		}
		} finally {
		accounts.accountsDb.endTransaction();