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

Merge "Ignore SQLite exceptions in AccountManager onPackageAdded" into main

Browse Source
This commit is contained in:
Dmitry Dementyev
2023-07-12 20:10:00 +00:00
committed by Android (Google) Code Review
parent f4517f851a d69b23c8d3
commit 44f68f332a
1 changed files with 17 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -357,15 +357,25 @@ public class AccountManagerService
@Override
public void onPackageAdded(String packageName, int uid) {
// Called on a handler, and running as the system
UserAccounts accounts = getUserAccounts(UserHandle.getUserId(uid));
cancelAccountAccessRequestNotificationIfNeeded(uid, true, accounts);
try {
UserAccounts accounts = getUserAccounts(UserHandle.getUserId(uid));
cancelAccountAccessRequestNotificationIfNeeded(uid, true, accounts);
} catch (SQLiteCantOpenDatabaseException e) {
Log.w(TAG, "Can't read accounts database", e);
return;
}
}
@Override
public void onPackageUpdateFinished(String packageName, int uid) {
// Called on a handler, and running as the system
UserAccounts accounts = getUserAccounts(UserHandle.getUserId(uid));
cancelAccountAccessRequestNotificationIfNeeded(uid, true, accounts);
try {
UserAccounts accounts = getUserAccounts(UserHandle.getUserId(uid));
cancelAccountAccessRequestNotificationIfNeeded(uid, true, accounts);
} catch (SQLiteCantOpenDatabaseException e) {
Log.w(TAG, "Can't read accounts database", e);
return;
}
}
}.register(mContext, mHandler.getLooper(), UserHandle.ALL, true);
@@ -391,6 +401,9 @@ public class AccountManagerService
}
} catch (NameNotFoundException e) {
/* ignore */
} catch (SQLiteCantOpenDatabaseException e) {
Log.w(TAG, "Can't read accounts database", e);
return;
}
}
});