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

Merge "Prevent crash in AccountManager after profile removal." am: 6cbae2d6d0 am: 97bf3c581e

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2640545

Change-Id: I278956d1c33d20f5ff65be03f71cf559e466789e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Dmitry Dementyev
2023-06-29 19:07:42 +00:00
committed by Automerger Merge Worker
parent 572a96d71e 97bf3c581e
commit 86ae0334a0
1 changed files with 15 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -67,6 +67,7 @@ import android.content.pm.Signature;
import android.content.pm.SigningDetails.CertCapabilities; import android.content.pm.SigningDetails.CertCapabilities;
import android.content.pm.UserInfo; import android.content.pm.UserInfo;
import android.database.Cursor; import android.database.Cursor;
import android.database.sqlite.SQLiteCantOpenDatabaseException;
import android.database.sqlite.SQLiteFullException; import android.database.sqlite.SQLiteFullException;
import android.database.sqlite.SQLiteStatement; import android.database.sqlite.SQLiteStatement;
import android.os.Binder; import android.os.Binder;
@@ -1383,7 +1384,13 @@ public class AccountManagerService
private void purgeOldGrants(UserAccounts accounts) { private void purgeOldGrants(UserAccounts accounts) {
synchronized (accounts.dbLock) { synchronized (accounts.dbLock) {
synchronized (accounts.cacheLock) { synchronized (accounts.cacheLock) {
List<Integer> uids = accounts.accountsDb.findAllUidGrants(); List<Integer> uids;
try {
uids = accounts.accountsDb.findAllUidGrants();
} catch (SQLiteCantOpenDatabaseException e) {
Log.w(TAG, "Could not delete grants for user = " + accounts.userId);
return;
}
for (int uid : uids) { for (int uid : uids) {
final boolean packageExists = mPackageManager.getPackagesForUid(uid) != null; final boolean packageExists = mPackageManager.getPackagesForUid(uid) != null;
if (packageExists) { if (packageExists) {
@@ -1409,7 +1416,13 @@ public class AccountManagerService
mPackageManager.getPackageUidAsUser(packageName, accounts.userId); mPackageManager.getPackageUidAsUser(packageName, accounts.userId);
} catch (NameNotFoundException e) { } catch (NameNotFoundException e) {
// package does not exist - remove visibility values // package does not exist - remove visibility values
accounts.accountsDb.deleteAccountVisibilityForPackage(packageName); try {
accounts.accountsDb.deleteAccountVisibilityForPackage(packageName);
} catch (SQLiteCantOpenDatabaseException sqlException) {
Log.w(TAG, "Could not delete account visibility for user = "
+ accounts.userId, sqlException);
continue;
}
synchronized (accounts.dbLock) { synchronized (accounts.dbLock) {
synchronized (accounts.cacheLock) { synchronized (accounts.cacheLock) {
for (Account account : accounts.visibilityCache.keySet()) { for (Account account : accounts.visibilityCache.keySet()) {