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

AppWidgetServiceImpl: add mWidgetPackages lock

Browse Source 
JobScheduler calls isBoundWidgetPackage(), but this can be extremely
slow while AppWidgetService is doing any meaningful work, causing
problems for the rest of the system. Remove that serialization by
moving mWidgetPackages behind its own lock.

Test: atest CtsAppWidgetTestCases
Bug: 161866124

Change-Id: Idae7d16d375dfd41f802ad193fa1ec939093c67a
This commit is contained in:
Tim Murray
2021-01-11 17:00:29 -08:00
parent dae30affe7
commit 50ddd5856b
1 changed files with 26 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
services/appwidget/java/com/android/server/appwidget/AppWidgetServiceImpl.java
View File

@@ -222,6 +222,7 @@ class AppWidgetServiceImpl extends IAppWidgetService.Stub implements WidgetBacku
private final SparseIntArray mLoadedUserIds = new SparseIntArray();
private final Object mWidgetPackagesLock = new Object();
private final SparseArray<ArraySet<String>> mWidgetPackages = new SparseArray<>();
private BackupRestoreController mBackupRestoreController;
@@ -2941,11 +2942,13 @@ class AppWidgetServiceImpl extends IAppWidgetService.Stub implements WidgetBacku
if (widget.provider == null) return;
int userId = widget.provider.getUserId();
ArraySet<String> packages = mWidgetPackages.get(userId);
if (packages == null) {
mWidgetPackages.put(userId, packages = new ArraySet<String>());
synchronized (mWidgetPackagesLock) {
ArraySet<String> packages = mWidgetPackages.get(userId);
if (packages == null) {
mWidgetPackages.put(userId, packages = new ArraySet<String>());
}
packages.add(widget.provider.info.provider.getPackageName());
}
packages.add(widget.provider.info.provider.getPackageName());
// If we are adding a widget it might be for a provider that
// is currently masked, if so mask the widget.
@@ -2972,22 +2975,24 @@ class AppWidgetServiceImpl extends IAppWidgetService.Stub implements WidgetBacku
final int userId = widget.provider.getUserId();
final String packageName = widget.provider.info.provider.getPackageName();
ArraySet<String> packages = mWidgetPackages.get(userId);
if (packages == null) {
return;
}
// Check if there is any other widget with the same package name.
// Remove packageName if none.
final int N = mWidgets.size();
for (int i = 0; i < N; i++) {
Widget w = mWidgets.get(i);
if (w.provider == null) continue;
if (w.provider.getUserId() == userId
&& packageName.equals(w.provider.info.provider.getPackageName())) {
synchronized (mWidgetPackagesLock) {
ArraySet<String> packages = mWidgetPackages.get(userId);
if (packages == null) {
return;
}
// Check if there is any other widget with the same package name.
// Remove packageName if none.
final int N = mWidgets.size();
for (int i = 0; i < N; i++) {
Widget w = mWidgets.get(i);
if (w.provider == null) continue;
if (w.provider.getUserId() == userId
&& packageName.equals(w.provider.info.provider.getPackageName())) {
return;
}
}
packages.remove(packageName);
}
packages.remove(packageName);
}
/**
@@ -3000,7 +3005,9 @@ class AppWidgetServiceImpl extends IAppWidgetService.Stub implements WidgetBacku
}
private void onWidgetsClearedLocked() {
mWidgetPackages.clear();
synchronized (mWidgetPackagesLock) {
mWidgetPackages.clear();
}
}
@Override
@@ -3008,7 +3015,7 @@ class AppWidgetServiceImpl extends IAppWidgetService.Stub implements WidgetBacku
if (Binder.getCallingUid() != Process.SYSTEM_UID) {
throw new SecurityException("Only the system process can call this");
}
synchronized (mLock) {
synchronized (mWidgetPackagesLock) {
final ArraySet<String> packages = mWidgetPackages.get(userId);
if (packages != null) {
return packages.contains(packageName);