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 
am: 0544462bf1

Change-Id: Ibc72de68280c0d859e8391654f4d67de66515800
This commit is contained in:
Dmitry Dementyev
2016-07-18 23:48:53 +00:00
committed by android-build-merger
parent 14c55bce2f 0544462bf1
commit 33c20d39e3
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
}
}
}
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);