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

Merge "Return widget uid only when it is bound to screen" into tm-qpr-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2023-01-11 01:35:16 +00:00
committed by Android (Google) Code Review
parent e930c8d9c4 71e6090f5b
commit 731c7bb7b5
1 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -817,7 +817,8 @@ class AppWidgetServiceImpl extends IAppWidgetService.Stub implements WidgetBacku
if (host != null) {
host.callbacks = null;
pruneHostLocked(host);
mAppOpsManagerInternal.updateAppWidgetVisibility(host.getWidgetUids(), false);
mAppOpsManagerInternal.updateAppWidgetVisibility(host.getWidgetUidsIfBound(),
false);
}
}
}
@@ -888,12 +889,8 @@ class AppWidgetServiceImpl extends IAppWidgetService.Stub implements WidgetBacku
Host host = lookupHostLocked(id);
if (host != null) {
try {
mAppOpsManagerInternal.updateAppWidgetVisibility(host.getWidgetUids(), false);
} catch (NullPointerException e) {
Slog.e(TAG, "setAppWidgetHidden(): Getting host uids: " + host.toString(), e);
throw e;
}
mAppOpsManagerInternal.updateAppWidgetVisibility(host.getWidgetUidsIfBound(),
false);
}
}
}
@@ -4345,14 +4342,15 @@ class AppWidgetServiceImpl extends IAppWidgetService.Stub implements WidgetBacku
PendingHostUpdate.appWidgetRemoved(appWidgetId));
}
public SparseArray<String> getWidgetUids() {
public SparseArray<String> getWidgetUidsIfBound() {
final SparseArray<String> uids = new SparseArray<>();
for (int i = widgets.size() - 1; i >= 0; i--) {
final Widget widget = widgets.get(i);
if (widget.provider == null) {
if (DEBUG) {
Slog.e(TAG, "Widget with no provider " + widget.toString());
Slog.d(TAG, "Widget with no provider " + widget.toString());
}
continue;
}
final ProviderId providerId = widget.provider.id;
uids.put(providerId.uid, providerId.componentName.getPackageName());