Merge \\"Include correct account id in action_called_account_remove log... (fa30cf74) · Commits · e / os / android_frameworks_base

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

+18 −4

Original line number	Original line	Diff line number	Diff line
	@@ -1553,9 +1553,15 @@ public class AccountManagerService
	}		}
	}		}
	}		}
			SQLiteDatabase db = accounts.openHelper.getReadableDatabase();
	logRecord(accounts, DebugDbHelper.ACTION_CALLED_ACCOUNT_REMOVE, TABLE_ACCOUNTS);		final long accountId = getAccountIdLocked(db, account);
			logRecord(
			db,
			DebugDbHelper.ACTION_CALLED_ACCOUNT_REMOVE,
			TABLE_ACCOUNTS,
			accountId,
			accounts,
			callingUid);
	try {		try {
	new RemoveAccountSession(accounts, response, account, expectActivityLaunch).bind();		new RemoveAccountSession(accounts, response, account, expectActivityLaunch).bind();
	} finally {		} finally {
	@@ -1587,7 +1593,15 @@ public class AccountManagerService
	throw new SecurityException(msg);		throw new SecurityException(msg);
	}		}
	UserAccounts accounts = getUserAccountsForCaller();		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();		long identityToken = clearCallingIdentity();
	try {		try {
	return removeAccountInternal(accounts, account, callingUid);		return removeAccountInternal(accounts, account, callingUid);