Merge \"Include correct account id in action_called_account_remove log message.\" into nyc-dev (33c20d39) · Commits · e / os / android_frameworks_base

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

+18 −4

Original line number	Diff line number	Diff line
		@@ -1555,9 +1555,15 @@ public class AccountManagerService
		}
		}
		}

		logRecord(accounts, DebugDbHelper.ACTION_CALLED_ACCOUNT_REMOVE, TABLE_ACCOUNTS);

		SQLiteDatabase db = accounts.openHelper.getReadableDatabase();
		final long accountId = getAccountIdLocked(db, account);
		logRecord(
		db,
		DebugDbHelper.ACTION_CALLED_ACCOUNT_REMOVE,
		TABLE_ACCOUNTS,
		accountId,
		accounts,
		callingUid);
		try {
		new RemoveAccountSession(accounts, response, account, expectActivityLaunch).bind();
		} finally {
		@@ -1589,7 +1595,15 @@ public class AccountManagerService
		throw new SecurityException(msg);
		}
		UserAccounts accounts = getUserAccountsForCaller();
		logRecord(accounts, DebugDbHelper.ACTION_CALLED_ACCOUNT_REMOVE, TABLE_ACCOUNTS);
		SQLiteDatabase db = accounts.openHelper.getReadableDatabase();
		final long accountId = getAccountIdLocked(db, account);
		logRecord(
		db,
		DebugDbHelper.ACTION_CALLED_ACCOUNT_REMOVE,
		TABLE_ACCOUNTS,
		accountId,
		accounts,
		callingUid);
		long identityToken = clearCallingIdentity();
		try {
		return removeAccountInternal(accounts, account, callingUid);