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

Merge "Include correct account id in action_called_account_remove log message." into nyc-dev

Browse Source
This commit is contained in:
Dmitry Dementyev
2016-07-18 23:37:29 +00:00
committed by Android (Google) Code Review
parent bd80098059 e59fc5fe55
commit 0544462bf1
1 changed files with 18 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
services/core/java/com/android/server/accounts/AccountManagerService.java
View File

@@ -1555,9 +1555,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 {
@@ -1589,7 +1595,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);